Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/control-center.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -82,8 +82,8 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/control-center \
-    --localstatedir=/var/lib \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/control-center \
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -134,18 +134,18 @@
         gnome-font-properties, gnome-font-viewer, gnome-keybinding-properties,
         gnome-keyboard-properties, gnome-mouse-properties,
-        gnome-network-preferences, gnome-settings-daemon, gnome-sound-properties,
-        gnome-theme-applier, gnome-theme-manager, gnome-theme-thumbnailer,
+        gnome-network-preferences, gnome-sound-properties,
+        gnome-theme-manager, gnome-theme-thumbnailer,
         gnome-thumbnail-font, gnome-typing-monitor, gnome-ui-properties,
-        and gnome-window-properties</seg>
+        gnome-window-properties, and themus-theme-applier</seg>
         <seg>libgnome-window-settings.[so,a],
         <application>GNOME VFS</application> and window manager settings library
         modules and <application>Nautilus</application> library module
         extensions</seg>
-        <seg>several config directories under the
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy,
-        $GNOME_PREFIX/include/gnome-window-settings-2.0,
-        $GNOME_PREFIX/lib/[nautilus,window-manager-settings],
-        $GNOME_PREFIX/share/control-center-2.0, and
-        $GNOME_PREFIX/share/gnome/[cursor-fonts,vfolders]</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,desktop/][,schemas/]apps/[too many to list]
+        and the following subdirectories of $GNOME_PREFIX/:
+        include/gnome-window-settings-2.0,
+        lib/[lib, nautilus, window-manager-settings],
+        share/[[,gnome/help/,omf]control-center-2.0,
+        gnome/[cursor-fonts,vfolders]]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gail.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -97,5 +97,5 @@
 
 <screen role="root"><userinput>ln -v -s `pkg-config --variable=prefix ORBit-2.0`/lib/gtk-2.0/modules \
-    /usr/lib/gtk-2.0</userinput></screen>
+         /usr/lib/gtk-2.0</userinput></screen>
 
   </sect2>
@@ -122,7 +122,8 @@
         <seg>libgailutil.so and <application>GAIL</application>
         <application>GTK+</application> modules</seg>
-        <seg>$GNOME_PREFIX/include/gail-1.0,
-        $GNOME_PREFIX/lib/gtk-2.0/modules, and
-        $GNOME_PREFIX/share/gtk-doc/html/gail-libgail-util</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/gail-1.0,
+        lib/gtk-2.0/modules, and
+        share/gtk-doc/html/gail-libgail-util</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gconf.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -80,6 +80,7 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/GConf \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/GConf \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -124,9 +125,9 @@
         <seg>gconf-merge-tree and gconftool-2</seg>
         <seg>libgconf-2.[so,a]</seg>
-        <seg>&gnome-etc-dir;/gconf,
-        $GNOME_PREFIX/include/gconf,
-        $GNOME_PREFIX/lib/GConf,
-        $GNOME_PREFIX/share/gtk-doc/html/gconf,
-        and $GNOME_PREFIX/share/sgml/gconf</seg>
+        <seg>&gnome-etc-dir;/gconf and the following subdirectories of
+        $GNOME_PREFIX/:
+        include/gconf,
+        lib/GConf, and
+        share/[GConf, gtk-doc/html/gconf, sgml/gconf]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-applets.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -89,8 +89,8 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/gnome-applets \
-    --localstatedir=/var/lib \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/gnome-applets \
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -136,20 +136,13 @@
 
       <seglistitem>
-        <seg>accessx-status-applet, battstat-applet-2, charpick_applet2,
-        cpufreq-applet, cpufreq-selector, drivemount_applet2,
-        geyes_applet2, gnome-keyboard-applet, gswitchit-plugins-capplet,
-        gtik2_applet2, gweather-applet-2, mini_commander_applet,
-        mixer_applet2, modem_applet, multiload-applet-2, null_applet,
-        stickynotes_applet, and trashapplet</seg>
+        <seg>cpufreq-selector and gswitchit-plugins-capplet</seg>
         <seg>None</seg>
-        <seg>several config directories under the
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy,
-        $GNOME_PREFIX/include/libgswitchit,
-        $GNOME_PREFIX/lib/gnome-applets,
-        several help directories under the $GNOME_PREFIX/share/gnome/help/ hierarchy,
-        $GNOME_PREFIX/share/gnome-applets,
-        $GNOME_PREFIX/share/omf/gnome-applets,
-        $GNOME_PREFIX/share/pixmaps/[accessx-status-applet,cpufreq-applet,stickynotes],
-        and $GNOME_PREFIX/share/xmodmap</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]apps/[too
+        many to list] and the following subdirectories of $GNOME_PREFIX/:
+        include/libgswitchit,
+        lib/gnome-applets,
+        share/[gnome-applets, [gnome/help,omf]/[too many to list],
+        pixmaps/[accessx-status-applet, cpufreq-applet, stickynotes], and
+        xmodmap]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-backgrounds.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -98,6 +98,6 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/pixmaps/backgrounds and
-        $GNOME_PREFIX/share/gnome-background-properties</seg>
+        <seg>$GNOME_PREFIX/share/[gnome-background-properties,
+        pixmaps/backgrounds]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-desktop.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -79,5 +79,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -118,6 +119,7 @@
         <seg>gnome-about</seg>
         <seg>libgnome-desktop-2.[so,a]</seg>
-        <seg>$GNOME_PREFIX/include/gnome-desktop-2.0, $GNOME_PREFIX/share/gnome,
-        $GNOME_PREFIX/share/gnome-about, and $GNOME_PREFIX/share/omf</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/gnome-desktop-2.0,
+        share/[gnome-about, [gnome/help,omf]/[fdl,gnome-feedback,gpl,lgpl]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-doc-utils.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -111,11 +111,7 @@
         <seg>gnome-doc-prepare and xml2po</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/gnome-doc-utils,
-        $GNOME_PREFIX/share/gnome/help/gnome-doc-make,
-        $GNOME_PREFIX/share/gnome/help/gnome-doc-xslt,
-        $GNOME_PREFIX/share/omf/gnome-doc-make,
-        $GNOME_PREFIX/share/omf/gnome-doc-xslt,
-        $GNOME_PREFIX/share/xml/gnome and
-        $GNOME_PREFIX/share/xml2po</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        share/[gnome-doc-utils, gnome/help/gnome-doc-[make,xslt],
+        omf/gnome-doc-[make,xslt], xml/gnome, and xml2po]</seg>
         <seg>Custom DocBook XSLT stylesheets</seg>
       </seglistitem>
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-keyring.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -76,6 +76,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/gnome-keyring &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/gnome-keyring &amp;&amp;
 make</userinput></screen>
 
@@ -110,6 +110,7 @@
         <seg>gnome-keyring-daemon</seg>
         <seg>libgnome-keyring.so</seg>
-        <seg>$GNOME_PREFIX/include/gnome-keyring-1 and
-        $GNOME_PREFIX/lib/gnome-keyring</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/gnome-keyring-1 and
+        lib/gnome-keyring</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-menus.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -86,5 +86,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -136,7 +136,9 @@
         <seg>gnome-menu-spec-test</seg>
         <seg>libgnome-menu.[so,a]</seg>
-        <seg>&gnome-etc-dir;/xdg, $GNOME_PREFIX/include/gnome-menus,
-        $GNOME_PREFIX/lib/python2.4/site-packages/GMenuSimpleEditor and
-        $GNOME_PREFIX/share/desktop-directories</seg>
+        <seg>&gnome-etc-dir;/xdg and the following subdirectories of
+        $GNOME_PREFIX/:
+        include/gnome-menus,
+        lib/python2.4/site-packages/GMenuSimpleEditor,
+        share/[desktop-directories, gnome-menus]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-mime-data.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -77,5 +77,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -93,6 +93,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch
-    puts configuration files in <filename class="directory">&gnome-etc-dir;</filename>
+    <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>
 
@@ -110,6 +110,5 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/application-registry and
-        $GNOME_PREFIX/share/mime-info</seg>
+        <seg>$GNOME_PREFIX/share/[application-registry, share/mime-info]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-panel.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -68,6 +68,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="evolution-data-server"/>
-    (required if you plan to install <application>Evolution</application> or
-    <application>GnomeMeeting</application>) and
+    (required if you plan to install <xref linkend="evolution"/> or
+    <xref linkend="gnomemeeting"/>) and
     <xref linkend="gtk-doc"/></para>
 
@@ -81,7 +81,8 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/gnome-panel \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/gnome-panel \
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -118,15 +119,13 @@
 
       <seglistitem>
-        <seg>clock-applet, fish-applet-2, gnome-desktop-item-edit, gnome-panel,
-        gnome-desktop-item-edit, notification-area-applet, and wnck-applet</seg>
-        <seg>libpanel-applet-2.[so,a] and bonobo servers</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]/apps,
-        $GNOME_PREFIX/include/panel-2.0,
-        $GNOME_PREFIX/share/idl/gnome-panel-2.0,
-        some help directories under the $GNOME_PREFIX/share/gnome/help hierarchy,
-        $GNOME_PREFIX/share/gnome/icons,
-        $GNOME_PREFIX/share/gnome/panel,
-        $GNOME_PREFIX/share/gtk-doc/html/panel-applet, and
-        $GNOME_PREFIX/share/omf/gnome-panel</seg>
+        <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg>
+        <seg>libpanel-applet-2.[so,a]</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]/apps
+        and the following subdirectories of $GNOME_PREFIX/:
+        include/panel-2.0,
+        lib/gnome-panel,
+        share/[gnome/[help/[too many to list], panel],
+        gtk-doc/html/panel-applet, icons, idl/gnome-panel-2.0,
+        omf/[too many too list]]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-session.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -76,5 +76,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -106,8 +106,7 @@
       <seglistitem>
         <seg>gnome-session, gnome-session-properties, gnome-session-remove,
-        gnome-session-save, gnome-smproxy, and gnome-wm</seg>
+        gnome-session-save, and gnome-wm</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gnome-session,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gnome-session,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnome-session
         and $GNOME_PREFIX/share/pixmaps/splash</seg>
       </seglistitem>
@@ -140,15 +139,4 @@
       </varlistentry>
 
-      <varlistentry id="gnome-smproxy">
-        <term><command>gnome-smproxy</command></term>
-        <listitem>
-          <para>handles basic session management for applications that
-          do not support XSM.</para>
-          <indexterm zone="gnome-session gnome-smproxy">
-            <primary sortas="b-gnome-smproxy">gnome-smproxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gnome-wm">
         <term><command>gnome-wm</command></term>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-terminal.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -76,5 +76,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -112,9 +113,6 @@
         <seg>gnome-terminal</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/apps/gnome-terminal,
-        $GNOME_PREFIX/share/gnome/help/gnome-terminal,
-        $GNOME_PREFIX/share/gnome-terminal, and
-        $GNOME_PREFIX/share/omf/gnome-terminal</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/gnome-terminal
+        and $GNOME_PREFIX/share/[,gnome/help/, omf/]gnome-terminal</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome-vfs.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -93,7 +93,7 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/gnome-vfs-2.0 \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/gnome-vfs-2.0 \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -127,5 +127,5 @@
     need to be passed if you have <ulink
     url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink>
-    installed as the <command>eject</command> program is used by default.</para>
+    installed, as the <command>eject</command> program is used by default.</para>
 
     <para><option>--enable-gtk-doc</option>: Use this option if you have
@@ -147,11 +147,10 @@
         gnomevfs-mkdir, gnomevfs-mv, gnomevfs-rm, and gnome-vfs-daemon</seg>
         <seg>libgnomevfs-2.[so,a] and modules</seg>
-        <seg>&gnome-etc-dir;/gconf/schemas,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/[desktop,schemas,system],
-        &gnome-etc-dir;/gnome-vfs-2.0,
-        $GNOME_PREFIX/include/gnome-vfs-2.0,
-        $GNOME_PREFIX/include/gnome-vfs-module-2.0,
-        $GNOME_PREFIX/lib/gnome-vfs-2.0, and
-        $GNOME_PREFIX/share/gtk-doc/html/gnome-vfs-2.0</seg>
+        <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/:
+        include/gnome-vfs-[,module-]2.0,
+        lib/gnome-vfs[,-2.0],
+        share/gtk-doc/html/gnome-vfs-2.0</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome2-user-docs.xml
===================================================================
--- gnome/core/gnome2-user-docs.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/gnome2-user-docs.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -79,5 +79,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -114,6 +114,6 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/gnome/help/[gnome-access-guide,system-admin-guide,user-guide]
-        and $GNOME_PREFIX/share/omf/[gnome2-user-docs,user-guide]</seg>
+        <seg>$GNOME_PREFIX/share/[gnome/help/[gnome-access-guide,system-admin-guide,user-guide],
+        omf/[gnome2-user-docs,user-guide]]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libbonobo.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -10,5 +10,5 @@
   <!ENTITY libbonobo-size          "1.3 MB">
   <!ENTITY libbonobo-buildsize     "35.3 MB">
-  <!ENTITY libbonobo-time          "0.7 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY libbonobo-time          "0.7 SBU">
 ]>
 
@@ -82,6 +82,7 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/bonobo \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/bonobo \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -131,9 +132,10 @@
         <application>ORBit-2</application> bonobo module, bonobo
         servers, and libmoniker_std_2.[so,a] bonobo library</seg>
-        <seg>&gnome-etc-dir;, $GNOME_PREFIX/include/bonobo-activation-2.0,
-        $GNOME_PREFIX/include/libbonobo-2.0,
-        $GNOME_PREFIX/lib/bonobo[,2.0],
-        $GNOME_PREFIX/share/gtk-doc/html/[bonobo-activation,libbonobo], and
-        $GNOME_PREFIX/share/idl/bonobo-[,activation-]2.0</seg>
+        <seg>&gnome-etc-dir;/bonobo-activation and the following subdirectories
+        of $GNOME_PREFIX/:
+        include/[bonobo-activation-2.0,libbonobo-2.0],
+        lib/[bonobo[,-2.0],libbonobo], and
+        share/[gtk-doc/html/[bonobo-activation,libbonobo],
+        idl/bonobo-[,activation-]2.0]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libbonoboui.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -98,8 +98,7 @@
         <seg>bonobo-browser and test-moniker</seg>
         <seg>libbonoboui-2.[so,a] and libbonobo.[so,a] Glade library</seg>
-        <seg>$GNOME_PREFIX/include/libbonoboui-2.0,
-        $GNOME_PREFIX/share/applications,
-        $GNOME_PREFIX/share/gtk-doc/html/libbonoboui, and
-        $GNOME_PREFIX/share/gnome-2.0</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/libbonoboui-2.0 and
+        share/[applications, gnome-2.0, gtk-doc/html/libbonoboui]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libgnome.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -77,5 +77,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; --localstatedir=/var/lib &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
@@ -117,9 +118,8 @@
         <seg>libgnome-2.[so,a] and the libmoniker_extra_2.[so,a] bonobo
         library</seg>
-        <seg>several configuration directories under the
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/ hierarchy,
-        &gnome-etc-dir;/sound,
-        GNOME_PREFIX/include/libgnome-2.0, and
-        GNOME_PREFIX/share/gtk-doc/html/libgnome</seg>
+        <seg>&gnome-etc-dir;/[gconf/gconf.xml.defaults/[too many to list],
+        sound],
+        include/libgnome-2.0, and
+        share/gtk-doc/html/libgnome</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libgnomecanvas.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -104,7 +104,8 @@
         <seg>libgnomecanvas-2.[so,a] and the libcanvas.[so,a] Glade
         library</seg>
-        <seg>$GNOME_PREFIX/include/libgnomecanvas-2.0,
-        $GNOME_PREFIX/lib/libglade, and
-        $GNOME_PREFIX/share/gtk-doc/html/libgnomecanvas</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/libgnomecanvas-2.0,
+        lib/libglade, and
+        share/gtk-doc/html/libgnomecanvas</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libgnomeui.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -78,6 +78,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config \
-    --variable=prefix ORBit-2.0`/lib/libgnomeui &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/libgnomeui &amp;&amp;
 make</userinput></screen>
 
@@ -94,5 +94,5 @@
 
 <screen role="root"><userinput>ln -v -s $GNOME_PREFIX/lib/gtk-2.0/2.4.0/filesystems \
-        /usr/lib/gtk-2.0/2.4.0</userinput></screen>
+    /usr/lib/gtk-2.0/2.4.0</userinput></screen>
 
   </sect2>
@@ -143,9 +143,10 @@
       <seglistitem>
         <seg>gnome_segv2</seg>
-        <seg>libgnomeui-2[so,a], libgnome[so,a] glade library, and
-        libgnome-vfs[so,a] <application>GTK+</application> library.</seg>
-        <seg>$GNOME_PREFIX/include/libgnomeui-2.0,
-        $GNOME_PREFIX/lib/gtk-2.0/2.4.0/filesystems, and
-        $GNOME_PREFIX/share/gtk-doc/html/libgnomeui</seg>
+        <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/:
+        include/libgnomeui-2.0,
+        lib/[gtk-2.0/2.4.0/filesystems, libgnomeui], and
+        share/gtk-doc/html/libgnomeui</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/libgtop.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -81,5 +81,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --infodir=`pkg-config --variable=prefix ORBit-2.0`/share/info &amp;&amp;
+            --infodir=`pkg-config \
+            --variable=prefix ORBit-2.0`/share/info &amp;&amp;
 make</userinput></screen>
 
@@ -149,8 +150,9 @@
 
       <seglistitem>
-        <seg>file_by_inode2, mkinodedb2</seg>
-        <seg>libgtop-2.0</seg>
-        <seg>$GNOME_PREFIX/include/libgtop-2.0 and
-        and $GNOME_PREFIX/share/libgtop-2.10.1</seg>
+        <seg>file_by_inode2 and mkinodedb2</seg>
+        <seg>libgtop-2.0.[so,a]</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/libgtop-2.0 and
+        share/libgtop-&libgtop-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/nautilus.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -79,5 +79,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -114,11 +114,9 @@
         <seg>nautilus, nautilus-connect-server, and
         nautilus-file-management-properties</seg>
-        <seg>libnautilus-extension.so, libnautilus-private.so,
-        and Nautilus_shell.server bonobo server</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[apps,schemas/apps]/nautilus,
-        $GNOME_PREFIX/include/nautilus,
-        $GNOME_PREFIX/share/doc/nautilus-2.10.1,
-        $GNOME_PREFIX/share/nautilus, and
-        $GNOME_PREFIX/share/pixmaps/nautilus</seg>
+        <seg>libnautilus-extension.so, libnautilus-private.so</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas]apps/nautilus
+        and the following subdirectories of $GNOME_PREFIX/:
+        include/nautilus,
+        share/[doc/nautilus-&nautilus-version;, [,pixmaps]nautilus]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/orbit2.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -10,5 +10,5 @@
   <!ENTITY ORBit2-size          "676 KB">
   <!ENTITY ORBit2-buildsize     "32.3 MB">
-  <!ENTITY ORBit2-time          "0.7 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY ORBit2-time          "0.7 SBU">
 ]>
 
@@ -78,5 +78,6 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -121,8 +122,8 @@
         <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>$GNOME_PREFIX/include/orbit-2.0,
-        $GNOME_PREFIX/lib/orbit-2.0,
-        $GNOME_PREFIX/share/gtk-doc/html/ORBit2,
-        and $GNOME_PREFIX/share/idl/orbit-2.0</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
+        include/orbit-2.0,
+        lib/orbit-2.0, and
+        share/[gtk-doc/html/ORBit2, idl/orbit-2.0]</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/scrollkeeper.xml
===================================================================
--- gnome/core/scrollkeeper.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/scrollkeeper.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -75,9 +75,12 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --disable-static \
-    --with-omfdirs=/usr/share/omf:/opt/gnome-1.4/share/omf:\
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --with-omfdirs=/usr/share/omf:/opt/gnome-1.4/share/omf:\
 /opt/kde-&kde-version;/share/omf:\
 /opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &amp;&amp;
+
 make</userinput></screen>
 
@@ -158,6 +161,6 @@
         <seg>libscrollkeeper.so</seg>
         <seg>/usr/share/doc/scrollkeeper-&scrollkeeper-version;,
-        /usr/share/omf/scrollkeeper, /usr/share/scrollkeeper,
-        /usr/share/xml/scrollkeeper, and /var/lib/scrollkeeper</seg>
+        /usr/share/[omf, [,xml/]scrollkeeper], and
+        /var/lib/scrollkeeper</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 937425f11edd0878f023d0d382963c61e2aa481c)
+++ gnome/core/yelp.xml	(revision e62f7011398fcba563e3acda39d20a6933d33032)
@@ -89,5 +89,6 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -121,7 +122,5 @@
         <seg>gnome-help and yelp</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/yelp,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/yelp,
-        $GNOME_PREFIX/share/icons/hicolor/192x192 and
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[,schemas/]apps/yelp and
         $GNOME_PREFIX/share/yelp</seg>
       </seglistitem>
