Index: general.ent
===================================================================
--- general.ent	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ general.ent	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 20th, &year;">
+<!ENTITY releasedate  "January 25th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -606,5 +606,5 @@
 
 <!-- Part VIII -->
-<!-- Chapteris 29-32 -->
+<!-- Chapters 29-31 -->
 <!ENTITY kde4-version                 "4.6.0">
 <!ENTITY kde4-dldir                   "&kde4-version;">
@@ -637,18 +637,15 @@
 <!ENTITY gnome-minor-version          ".2">
 <!ENTITY gnome-etc-dir                "/etc/gnome/&gnome-version;&gnome-minor-version;">
+<!-- this is used by old gnome-2, which will be going, and by deprecated gnome,
+ which will be staying for a little while -->
+<!ENTITY gnome-old-etc-dir            "/etc/gnome/2.30.2">
 <!ENTITY gnome-download-http          "http://ftp.gnome.org/pub/gnome/sources">
 <!ENTITY gnome-download-ftp           "ftp://ftp.gnome.org/pub/gnome/sources">
 
+<!-- Chapter 32 -->
 <!-- Platform -->
 <!ENTITY GConf-version                "2.28.1">
 <!ENTITY gnome-icon-theme-version     "2.30.3">
 <!ENTITY gnome-mime-data-version      "2.18.0">
-<!ENTITY gnome-vfs-version            "2.24.4">
-<!ENTITY libbonobo-version            "2.24.3">
-<!ENTITY libbonoboui-version          "2.24.3">
-<!ENTITY libgnome-version             "2.30.0">
-<!ENTITY libgnomecanvas-version       "2.30.1">
-<!ENTITY libgnomeui-version           "2.24.3">
-<!ENTITY ORBit2-version               "2.14.19">
 
 <!-- Desktop -->
@@ -676,5 +673,5 @@
 <!ENTITY zenity-version               "2.30.0">
 
-<!-- Chapter 34 -->
+<!-- Chapter 33 -->
 
 <!-- Libraries -->
@@ -710,5 +707,4 @@
 <!ENTITY gnome-disk-utility-version   "2.30.1">
 <!ENTITY gnome-games-version          "2.30.2">
-<!ENTITY gnome-media-version          "2.30.0">
 <!ENTITY gnome-netstatus-version      "2.28.1">
 <!ENTITY gnome-nettool-version        "2.30.0">
@@ -738,4 +734,14 @@
 <!ENTITY orca-version                 "2.30.2">
 <!ENTITY mousetweaks-version          "2.30.2">
+
+<!-- Chapter 34 -->
+<!-- Deprecated -->
+<!ENTITY ORBit2-version               "2.14.19">
+<!ENTITY libbonobo-version            "2.24.3">
+<!ENTITY gnome-vfs-version            "2.24.4">
+<!ENTITY libgnome-version             "2.30.0">
+<!ENTITY libgnomecanvas-version       "2.30.1">
+<!ENTITY libbonoboui-version          "2.24.3">
+<!ENTITY libgnomeui-version           "2.24.3">
 
 <!-- Obsolete
@@ -871,4 +877,5 @@
 <!ENTITY audacious-plugins-version    "3.1">
 <!ENTITY amarok-version               "1.4.8">
+<!ENTITY gnome-media-version          "2.30.0">
 
 <!-- Chapter 41 -->
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ general/genlib/libgsf.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -93,5 +93,5 @@
 
 <screen><userinput>./configure --prefix=/usr \
-  --sysconfdir=&gnome-etc-dir; &amp;&amp;
+  --sysconfdir=&gnome-old-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -110,5 +110,5 @@
     <title>Command Explanations</title>
 
-    <para><command>--sysconfdir=&gnome-etc-dir;</command>: Use this parameter to
+    <para><command>--sysconfdir=&gnome-old-etc-dir;</command>: Use this parameter to
     ensure that if <application>GConf</application> has been installed, this
     package&apos;s schema files will be installed in the correct location instead
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ gnome/add/add.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -55,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-games.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-media.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-netstatus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-nettool.xml"/>
Index: ome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-md5sum        "027b11fb8b126ab1b25def6b9e121bd3">
-  <!ENTITY gnome-media-size          "2.6 MB">
-  <!ENTITY gnome-media-buildsize     "35 MB">
-  <!ENTITY gnome-media-time          "0.5 SBU">
-]>
-
-<sect1 id="gnome-media" xreflabel="GNOME Media-&gnome-media-version;">
-  <?dbhtml filename="gnome-media.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GNOME Media-&gnome-media-version;</title>
-
-  <indexterm zone="gnome-media">
-    <primary sortas="a-GNOME Media">GNOME Media</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Media</title>
-
-    <para>The <application>GNOME Media</application> package contains
-    <application>GNOME</application>'s media applications.</para>
-
-    &lfs65_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-media-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-media-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-media-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-media-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-media-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-media-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-doc-utils"/>
-      <xref linkend="gstreamer"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
-         recorder),
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libunique"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-media"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Media</title>
-
-    <para>Install <application>GNOME Media</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-media &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
-    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-audio-profiles-properties, gnome-sound-recorder,
-        gnome-volume-control, and gstreamer-properties</seg>
-        <seg>libgnome-media-profiles.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-media/profiles,
-        share/{gnome-media/{pixmaps,sounds},gnome-sound-recorder/ui,
-        gnome/help/{gnome-audio-profiles/*,gnome-sound-recorder/*,
-        gnome-volume-control/*,gstreamer-properties/*},
-        gstreamer-properties/icons,omf/{gnome-audio-profiles,
-        gnome-sound-recorder,gnome-volume-control,gstreamer-properties},
-        sounds/gnome/default/alerts}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-sound-recorder">
-        <term><command>gnome-sound-recorder</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s recorder.</para>
-          <indexterm zone="gnome-media gnome-sound-recorder">
-            <primary sortas="b-gnome-sound-recorder">gnome-sound-recorder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-volume-control">
-        <term><command>gnome-volume-control</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s mixer with volume
-          applet.</para>
-          <indexterm zone="gnome-media gnome-volume-control">
-            <primary sortas="b-gnome-volume-control">gnome-volume-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gstreamer-properties">
-        <term><command>gstreamer-properties</command></term>
-        <listitem>
-          <para>is a GUI front-end to <application>GStreamer</application>'s
-          audio/video input/output parameters.</para>
-          <indexterm zone="gnome-media gstreamer-properties">
-            <primary sortas="b-gstreamer-properties">gstreamer-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ gnome/core/core.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -30,11 +30,9 @@
   </caution>
 
-  <!-- This is used as a TOC separator -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
 
+  <!-- This is used as a TOC separator -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-platform.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orbit2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonobo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-shared-mime-info.xml"/>
@@ -42,9 +40,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-hicolor-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecanvas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonoboui.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeui.xml"/>
 
   <!-- This is used as a TOC separator -->
Index: ome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-vfs-download-http "&gnome-download-http;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-  <!ENTITY gnome-vfs-download-ftp  "&gnome-download-ftp;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-  <!ENTITY gnome-vfs-md5sum        "a05fab03eeef10a47dd156b758982f2e">
-  <!ENTITY gnome-vfs-size          "1.8 MB">
-  <!ENTITY gnome-vfs-buildsize     "56 MB">
-  <!ENTITY gnome-vfs-time          "1.0 SBU">
-]>
-
-<sect1 id="gnome-vfs" xreflabel="GNOME Virtual File System-&gnome-vfs-version;">
-  <?dbhtml filename="gnome-vfs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GNOME Virtual File System-&gnome-vfs-version;</title>
-
-  <indexterm zone="gnome-vfs">
-    <primary sortas="a-GNOME-Virtual-File-System">GNOME Virtual File System</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Virtual File System</title>
-
-    <para>The <application>GNOME Virtual File System</application> package
-    contains virtual file system libraries. This is used as one of the
-    foundations of the <application>Nautilus</application> file manager.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-vfs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-vfs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-vfs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-vfs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-vfs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-vfs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Virtual File System Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="GConf"/>, and
-    <xref linkend="gnome-mime-data"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="samba3"/>,
-    <xref linkend="gamin"/>,
-    <xref linkend="hal"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="openssh"/>,
-    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="avahi"/>,
-    <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-    <xref linkend="cdparanoia"/> (not recommended)</para>
-
-    <para>If you run <command>./configure --help</command> for the complete list
-    of dependency requirements and available parameters, you may notice a
-    message about the <ulink
-    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> 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 it is not available,
-    <application>GNOME-VFS</application> will fall back to using other mounting
-    mechanisms.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-vfs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Virtual File System</title>
-
-    <para>Install <application>GNOME Virtual File System</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-vfs-2.0 &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    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>
-
-    <para><option>--with-dbus-service-dir=/usr/share/dbus-1/services</option>:
-    Use this parameter if you linked <application>HAL</application> into the
-    build and you want the <filename>gnome-vfs-daemon.service</filename> file
-    installed in the default <application>D-Bus</application> location instead
-    of in <filename
-    class='directory'><envar>GNOME_PREFIX</envar>/share/dbus-1/services</filename>.
-    See the information in the configuration section below if you don't use this
-    parameter.</para>
-
-    <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
-    need to be passed if you have <xref linkend="eject"/> or <ulink
-    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> installed, as
-    the <command>eject</command> program is used if
-    <application>gnome-mount</application> is not installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gnome Virtual File System</title>
-
-    <sect3 id="gnome-vfs-config">
-      <title>Configuration Information</title>
-
-      <para>If <application>HAL</application> was linked into the build and
-      GNOME is being installed in any location other than
-      <filename class='directory'>/usr</filename>, you should create a local
-      <application>D-Bus</application> session configuration file so that the
-      installed <filename>gnome-vfs-daemon.service</filename> file can be
-      discovered by <application>D-Bus</application>. You should reference
-      the information on the <application>D-Bus</application> page for
-      instructions on how to create a
-      <xref linkend="dbus-session-config"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnomevfs-cat, gnomevfs-copy, gnomevfs-df, gnomevfs-info,
-        gnomevfs-ls, gnomevfs-mkdir, gnomevfs-monitor, gnomevfs-mv, gnomevfs-rm,
-        and gnome-vfs-daemon</seg>
-        <seg>libbzip2.{so,a}, libcomputer.{so,a}, libdns-sd.{so,a},
-        libfile.{so,a}, libftp.{so,a}, libgzip.{so,a}, libhttp.{so,a},
-        libnetwork.{so,a}, libnntp.{so,a}, libsftp.{so,a}, libtar.{so,a},
-        libvfs-test.{so,a}, and libgnomevfs-2.{so,a}</seg>
-        <seg>&gnome-etc-dir;/gnome-vfs-2.0/modules,
-        <envar>$GNOME_PREFIX</envar>/{include/{gnome-vfs-2.0/libgnomevfs,
-        gnome-vfs-module-2.0/libgnomevfs},lib/gnome-vfs-2.0/{include,modules},
-        share/gtk-doc/html/gnome-vfs-2.0}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libbonobo-download-http "&gnome-download-http;/libbonobo/2.24/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/2.24/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-md5sum        "b217cef6a187505290c66c5bf8225d38">
-  <!ENTITY libbonobo-size          "1.3 MB">
-  <!ENTITY libbonobo-buildsize     "37 MB">
-  <!ENTITY libbonobo-time          "0.8 SBU">
-]>
-
-<sect1 id="libbonobo" xreflabel="libbonobo-&libbonobo-version;">
-  <?dbhtml filename="libbonobo.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libbonobo-&libbonobo-version;</title>
-
-  <indexterm zone="libbonobo">
-    <primary sortas="a-Libbonobo">Libbonobo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbonobo</title>
-
-    <para>The <application>libbonobo</application> package contains
-    <filename class="libraryfile">libbonobo</filename> libraries.
-    This is a component and compound document system for
-    <application>GNOME-2</application>.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libbonobo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libbonobo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libbonobo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libbonobo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libbonobo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libbonobo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libbonobo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="ORBit2"/>, and
-    <xref linkend="popt"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/> and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libbonobo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbonobo</title>
-
-    <para>Install <application>libbonobo</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/bonobo-2.0 \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/bonobo-2.0</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of <filename
-    class="directory">$GNOME_PREFIX/lib/bonobo-2.0</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>activation-client, bonobo-activation-run-query, bonobo-slay,
-        echo-client-2, bonobo-activation-server, bonobo-echo-2, and
-        bonobo-activation-sysconf</seg>
-        <seg>libmoniker_std_2.{so,a}, libbonobo-2.{so,a},
-        libbonobo-activation.{so,a}, and Bonobo_module.{so,a}</seg>
-        <seg>&gnome-etc-dir;/bonobo-activation,
-        <envar>$GNOME_PREFIX</envar>/{include/{bonobo-activation-2.0/bonobo-activation,
-        libbonobo-2.0/bonobo},lib/{bonobo-2.0/samples,bonobo/{monikers,
-        servers}},share/{gtk-doc/html/{bonobo-activation,libbonobo},
-        idl/{bonobo-2.0,bonobo-activation-2.0}}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbonobo-2">
-        <term><filename class='libraryfile'>libbonobo-2.{so,a}</filename></term>
-        <listitem>
-          <para>are a set of language and system independent CORBA interfaces
-          for creating reusable components and compound documents.</para>
-          <indexterm zone="libbonobo libbonobo-2">
-            <primary sortas="c-libbonobo-2">libbonobo-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libbonoboui-download-http "&gnome-download-http;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-download-ftp  "&gnome-download-ftp;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-md5sum        "3a754b1df0a4d5fd4836a05020a0bb4a">
-  <!ENTITY libbonoboui-size          "905 KB">
-  <!ENTITY libbonoboui-buildsize     "33 MB">
-  <!ENTITY libbonoboui-time          "1.0 SBU">
-]>
-
-<sect1 id="libbonoboui" xreflabel="libbonoboui-&libbonoboui-version;">
-  <?dbhtml filename="libbonoboui.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libbonoboui-&libbonoboui-version;</title>
-
-  <indexterm zone="libbonoboui">
-    <primary sortas="a-Libbonoboui">Libbonoboui</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbonoboui</title>
-
-    <para>The <application>libbonoboui</application> package contains
-    <filename class="libraryfile">libbonoboui</filename> libraries.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libbonoboui-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libbonoboui-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libbonoboui-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libbonoboui-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libbonoboui-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libbonoboui-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libbonoboui Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libglade"/>,
-    <xref linkend="libgnome"/>, and
-    <xref linkend="libgnomecanvas"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libbonoboui"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbonoboui</title>
-
-    <para>Install <application>libbonoboui</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-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>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bonobo-browser and test-moniker</seg>
-        <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libbonoboui-2.0/bonobo,
-        share/{doc/libbonoboui-2.24.3,gnome-2.0/ui,
-        gtk-doc/html/libbonoboui}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbonoboui-2">
-        <term><filename class='libraryfile'>libbonoboui-2.{so,a}</filename></term>
-        <listitem>
-          <para>are the GUI portion of the <application>Bonobo</application>
-          libraries.</para>
-          <indexterm zone="libbonoboui libbonoboui-2">
-            <primary sortas="c-">libbonoboui-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-md5sum        "1f85adc40b242b953c0e96ad017c2616">
-  <!ENTITY libgnome-size          "1.7 MB">
-  <!ENTITY libgnome-buildsize     "28 MB">
-  <!ENTITY libgnome-time          "0.4 SBU">
-]>
-
-<sect1 id="libgnome" xreflabel="libgnome-&libgnome-version;">
-  <?dbhtml filename="libgnome.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgnome-&libgnome-version;</title>
-
-  <indexterm zone="libgnome">
-    <primary sortas="a-Libgnome">Libgnome</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnome</title>
-
-    <para>The <application>libgnome</application> package contains the
-    <filename class="libraryfile">libgnome</filename> library.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnome-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnome-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnome-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnome-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnome-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnome-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnome Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonobo"/> and
-    <xref linkend="gnome-vfs"/></para>
-
-    <bridgehead renderas="sect4">Recommended (if you plan on installing the
-    GNOME desktop)</bridgehead>
-    <para role="recommended"><xref linkend="esound"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnome"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnome</title>
-
-    <para>Install <application>libgnome</application> by running the following
-    commands:</para>
-
-<screen><userinput>
-./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir;                                \
-            --localstatedir=/var/lib                           \
-            --mandir=$(pkg-config --variable=prefix ORBit-2.0)/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This
-    parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
-    <filename class='directory'>/var/lib</filename> instead
-    of <filename class='directory'>$GNOME_PREFIX/var</filename>
-    to synchronize with the <application>GNOME Games</application>
-    installation and properly record high scores in
-    <filename class='directory'>/var/lib/games</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-esd</option>: This parameter is required if
-    <xref linkend="esound"/> is not installed.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-open</seg>
-        <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} (bonobo
-        library)</seg>
-        <seg>&gnome-etc-dir;/sound/events,
-        <envar>$GNOME_PREFIX</envar>/{include/libgnome-2.0/libgnome,
-        share/gtk-doc/html/libgnome}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnome-2">
-        <term><filename class='libraryfile'>libgnome-2.{so,a}</filename></term>
-        <listitem>
-          <para>are the non-GUI portion of the <application>GNOME</application>
-          libraries.</para>
-          <indexterm zone="libgnome libgnome-2">
-            <primary sortas="c-libgnome-2">libgnome-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libgnomecanvas-download-http "&gnome-download-http;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-download-ftp  "&gnome-download-ftp;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-md5sum        "362ab7b81024b3c3b4a712e7df01b169">
-  <!ENTITY libgnomecanvas-size          "570 KB">
-  <!ENTITY libgnomecanvas-buildsize     "16 MB">
-  <!ENTITY libgnomecanvas-time          "0.4 SBU">
-]>
-
-<sect1 id="libgnomecanvas" xreflabel="libgnomecanvas-&libgnomecanvas-version;">
-  <?dbhtml filename="libgnomecanvas.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgnomecanvas-&libgnomecanvas-version;</title>
-
-  <indexterm zone="libgnomecanvas">
-    <primary sortas="a-Libgnomecanvas">Libgnomecanvas</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomecanvas</title>
-
-    <para>The <application>libgnomecanvas</application> package contains
-    the <application>GNOME</application> canvas library.
-    It is an engine for structured graphics and one of the essential
-    <application>GNOME</application> libraries.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomecanvas-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomecanvas-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomecanvas-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomecanvas-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomecanvas-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomecanvas-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomecanvas Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="libart_lgpl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="libglade"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomecanvas"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomecanvas</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>libgnomecanvas</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgnomecanvas-2.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomecanvas-2.0/libgnomecanvas,
-        share/gtk-doc/html/libgnomecanvas}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libgnomeui-download-http "&gnome-download-http;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-md5sum        "ceab6f4370581d1a03c09f15cc103099">
-  <!ENTITY libgnomeui-size          "1.3 MB">
-  <!ENTITY libgnomeui-buildsize     "41 MB">
-  <!ENTITY libgnomeui-time          "0.7 SBU">
-]>
-
-<sect1 id="libgnomeui" xreflabel="libgnomeui-&libgnomeui-version;">
-  <?dbhtml filename="libgnomeui.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgnomeui-&libgnomeui-version;</title>
-
-  <indexterm zone="libgnomeui">
-    <primary sortas="a-Libgnomeui">Libgnomeui</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgnomeui</title>
-
-    <para>The <application>libgnomeui</application> package contains
-    <filename class="libraryfile">libgnomeui</filename> libraries.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgnomeui-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgnomeui-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgnomeui-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgnomeui-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgnomeui-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgnomeui-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgnomeui Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonoboui"/>,
-    <xref linkend="libgnome-keyring"/>, and
-    <xref linkend="xorg7-lib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="esound"/>, and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgnomeui"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgnomeui</title>
-
-    <para>Install <application>libgnomeui</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/libgnomeui &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    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>
-
-    <para><option>--with-kde-datadir=$KDE_PREFIX/share</option>: Use this
-    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/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libgnomeui</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Some applications cannot properly discover the
-      <application>libglade</application> interface library installed by
-      <application>libgnomeui</application>. Get around this problem by
-      initializing an environment variable which identifies the location
-      of the library. Add the following line to the system-wide
-      <filename>/etc/profile</filename> file, or to individual user's
-      <filename>~/.profile</filename> or <filename>~/.bashrc</filename>
-      files:</para>
-
-<screen><literal>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgnomeui-2.{so,a} and libgnome.{so,a} Glade library</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomeui-2.0/libgnomeui,
-        share/gtk-doc/html/libgnomeui}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgnomeui-2">
-        <term><filename class='libraryfile'>libgnomeui-2.{so,a}</filename></term>
-        <listitem>
-          <para>are the GUI portion of the <application>GNOME</application>
-          libraries.</para>
-          <indexterm zone="libgnomeui libgnomeui-2">
-            <primary sortas="c-libgnomeui-2">libgnomeui-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY ORBit2-download-http "&gnome-download-http;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-download-ftp  "&gnome-download-ftp;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-md5sum        "7082d317a9573ab338302243082d10d1">
-  <!ENTITY ORBit2-size          "764 KB">
-  <!ENTITY ORBit2-buildsize     "35 MB">
-  <!ENTITY ORBit2-time          "0.6 SBU">
-]>
-
-<sect1 id="ORBit2" xreflabel="ORBit2-&ORBit2-version;">
-  <?dbhtml filename="ORBit2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ORBit2-&ORBit2-version;</title>
-
-  <indexterm zone="ORBit2">
-    <primary sortas="a-ORBit2">ORBit2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ORBit2</title>
-
-    <para>The <application>ORBit2</application> package contains a
-    high-performance CORBA Object Request Broker. This allows programs
-    to send requests and receive replies from other programs.</para>
-
-    &lfs65_checked;
- 
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ORBit2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ORBit2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ORBit2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ORBit2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ORBit2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ORBit2-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ORBit2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libidl"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="openssl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/orbit2"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ORBit2</title>
-
-    <para>Install <application>ORBit2</application> by running
-    the following commands:</para>
-
-    <para>Run the following commands:</para>
-
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the base
-    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
-    install directory as described in the introduction of this Chapter.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ior-decode-2, linc-cleanup-sockets, orbit-idl-2,
-        orbit2-config and typelib-dump</seg>
-        <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><envar>$GNOME_PREFIX</envar>/{include/orbit-2.0/*,lib/orbit-2.0,
-        share/{gtk-doc/html/ORBit2,idl/orbit-2.0}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libORBit-2">
-        <term><filename class='libraryfile'>libORBit-2.{so,a}</filename></term>
-        <listitem>
-          <para>is the CORBA API.</para>
-          <indexterm zone="ORBit2 libORBit-2">
-            <primary sortas="c-libORBit-2">libORBit-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/core/pre-install-config.xml
===================================================================
--- gnome/core/pre-install-config.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ gnome/core/pre-install-config.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -16,9 +16,27 @@
   <title>Pre-installation Configuration</title>
 
+<!-- FIXME:ken -->
+<note>
+<para>The <application>GNOME</application> packages in this book are being
+updated to <application>GNOME-3</application>.  At the moment, the instructions
+and links fori many <application>GNOME</application> packages are probably
+broken. Please consult the archives for the BLFS-support mailing list, from
+January 24th 2012 onwards, for pointers to the old
+<application>GNOME-2</application> book and for where to look when building
+<application>GNOME-3</application>.</para>
+</note>
+
   <para>Set an environment variable to resolve the prefix destination.</para>
 
   <para>If <application>GNOME</application> is your desktop of choice:</para>
 
-<screen><userinput>export GNOME_PREFIX=/usr</userinput></screen>
+<screen><userinput>cat &gt; /etc/profile.d/gnome.sh &lt;&lt; "EOF" &amp;&amp;
+<literal>export GNOME_PREFIX=/usr
+export GNOME_SYSCONFDIR=&gnome-etc-dir;
+export XDG_CONFIG_DIRS=$GNOME_SYSCONFDIR/xdg
+export XDG_DATA_DIRS=/usr/share:/usr/local/share</literal>
+EOF
+. /etc/profile.d/gnome.sh</userinput></screen>
+
 
   <para>If you want to try-out <application>GNOME</application>, or install
Index: gnome/deprecated/deprecated.xml
===================================================================
--- gnome/deprecated/deprecated.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/deprecated.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="gnome-legacy">
+  <?dbhtml filename="deprecated.html"?>
+
+  <title>Deprecated GNOME Packages</title>
+
+  <para>This section contains legacy <application>GNOME-2</application>
+  packages which are currently used as dependencies by the stable versions
+  of some other applications.  When those applications have been updated to
+  newer stable releases, these packages will be removed from the book.</para>
+
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/> -->
+
+  <!-- This is used as a TOC separator -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-deprecated.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="orbit2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonobo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-vfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnome.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomecanvas.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbonoboui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnomeui.xml"/>
+
+</chapter>
Index: gnome/deprecated/dummy-deprecated.xml
===================================================================
--- gnome/deprecated/dummy-deprecated.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/dummy-deprecated.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<sect1 role="dummy">
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Legacy Gnome-2 libraries</title>
+  <para/>
+</sect1>
Index: gnome/deprecated/gnome-vfs.xml
===================================================================
--- gnome/deprecated/gnome-vfs.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/gnome-vfs.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnome-vfs-download-http "&gnome-download-http;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+  <!ENTITY gnome-vfs-download-ftp  "&gnome-download-ftp;/gnome-vfs/2.24/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+  <!ENTITY gnome-vfs-md5sum        "a05fab03eeef10a47dd156b758982f2e">
+  <!ENTITY gnome-vfs-size          "1.8 MB">
+  <!ENTITY gnome-vfs-buildsize     "56 MB">
+  <!ENTITY gnome-vfs-time          "1.0 SBU">
+]>
+
+<sect1 id="gnome-vfs" xreflabel="GNOME Virtual File System-&gnome-vfs-version;">
+  <?dbhtml filename="gnome-vfs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GNOME Virtual File System-&gnome-vfs-version;</title>
+
+  <indexterm zone="gnome-vfs">
+    <primary sortas="a-GNOME-Virtual-File-System">GNOME Virtual File System</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Virtual File System</title>
+
+    <para>The <application>GNOME Virtual File System</application> package
+    contains virtual file system libraries. This is used as one of the
+    foundations of the <application>Nautilus</application> file manager.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-vfs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-vfs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-vfs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-vfs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-vfs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-vfs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Virtual File System Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="dbus-glib"/>,
+    <xref linkend="GConf"/>, and
+    <xref linkend="gnome-mime-data"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="samba3"/>,
+    <xref linkend="gamin"/>,
+    <xref linkend="hal"/>,
+    <xref linkend="gtk-doc"/>,
+    <xref linkend="openssh"/>,
+    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
+    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+    <xref linkend="avahi"/>,
+    <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
+    <xref linkend="cdparanoia"/> (not recommended)</para>
+
+    <para>If you run <command>./configure --help</command> for the complete list
+    of dependency requirements and available parameters, you may notice a
+    message about the <ulink
+    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> 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 it is not available,
+    <application>GNOME-VFS</application> will fall back to using other mounting
+    mechanisms.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-vfs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Virtual File System</title>
+
+    <para>Install <application>GNOME Virtual File System</application>
+    by running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-old-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-vfs-2.0 &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    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>
+
+    <para><option>--with-dbus-service-dir=/usr/share/dbus-1/services</option>:
+    Use this parameter if you linked <application>HAL</application> into the
+    build and you want the <filename>gnome-vfs-daemon.service</filename> file
+    installed in the default <application>D-Bus</application> location instead
+    of in <filename
+    class='directory'><envar>GNOME_PREFIX</envar>/share/dbus-1/services</filename>.
+    See the information in the configuration section below if you don't use this
+    parameter.</para>
+
+    <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
+    need to be passed if you have <xref linkend="eject"/> or <ulink
+    url="http://hal.freedesktop.org/releases/">gnome-mount</ulink> installed, as
+    the <command>eject</command> program is used if
+    <application>gnome-mount</application> is not installed.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Gnome Virtual File System</title>
+
+    <sect3 id="gnome-vfs-config">
+      <title>Configuration Information</title>
+
+      <para>If <application>HAL</application> was linked into the build and
+      GNOME is being installed in any location other than
+      <filename class='directory'>/usr</filename>, you should create a local
+      <application>D-Bus</application> session configuration file so that the
+      installed <filename>gnome-vfs-daemon.service</filename> file can be
+      discovered by <application>D-Bus</application>. You should reference
+      the information on the <application>D-Bus</application> page for
+      instructions on how to create a
+      <xref linkend="dbus-session-config"/>.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnomevfs-cat, gnomevfs-copy, gnomevfs-df, gnomevfs-info,
+        gnomevfs-ls, gnomevfs-mkdir, gnomevfs-monitor, gnomevfs-mv, gnomevfs-rm,
+        and gnome-vfs-daemon</seg>
+        <seg>libbzip2.{so,a}, libcomputer.{so,a}, libdns-sd.{so,a},
+        libfile.{so,a}, libftp.{so,a}, libgzip.{so,a}, libhttp.{so,a},
+        libnetwork.{so,a}, libnntp.{so,a}, libsftp.{so,a}, libtar.{so,a},
+        libvfs-test.{so,a}, and libgnomevfs-2.{so,a}</seg>
+        <seg>&gnome-etc-dir;/gnome-vfs-2.0/modules,
+        <envar>$GNOME_PREFIX</envar>/{include/{gnome-vfs-2.0/libgnomevfs,
+        gnome-vfs-module-2.0/libgnomevfs},lib/gnome-vfs-2.0/{include,modules},
+        share/gtk-doc/html/gnome-vfs-2.0}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/libbonobo.xml
===================================================================
--- gnome/deprecated/libbonobo.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/libbonobo.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libbonobo-download-http "&gnome-download-http;/libbonobo/2.24/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/2.24/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-md5sum        "b217cef6a187505290c66c5bf8225d38">
+  <!ENTITY libbonobo-size          "1.3 MB">
+  <!ENTITY libbonobo-buildsize     "37 MB">
+  <!ENTITY libbonobo-time          "0.8 SBU">
+]>
+
+<sect1 id="libbonobo" xreflabel="libbonobo-&libbonobo-version;">
+  <?dbhtml filename="libbonobo.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libbonobo-&libbonobo-version;</title>
+
+  <indexterm zone="libbonobo">
+    <primary sortas="a-Libbonobo">Libbonobo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libbonobo</title>
+
+    <para>The <application>libbonobo</application> package contains
+    <filename class="libraryfile">libbonobo</filename> libraries.
+    This is a component and compound document system for
+    <application>GNOME-2</application>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libbonobo-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libbonobo-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libbonobo-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libbonobo-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libbonobo-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libbonobo-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libbonobo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="dbus-glib"/>,
+    <xref linkend="intltool"/>,
+    <xref linkend="libxml2"/>,
+    <xref linkend="ORBit2"/>, and
+    <xref linkend="popt"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="x-window-system"/> and
+    <xref linkend="gtk-doc"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libbonobo"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libbonobo</title>
+
+    <para>Install <application>libbonobo</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-old-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/bonobo-2.0 \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/bonobo-2.0</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of <filename
+    class="directory">$GNOME_PREFIX/lib/bonobo-2.0</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>activation-client, bonobo-activation-run-query, bonobo-slay,
+        echo-client-2, bonobo-activation-server, bonobo-echo-2, and
+        bonobo-activation-sysconf</seg>
+        <seg>libmoniker_std_2.{so,a}, libbonobo-2.{so,a},
+        libbonobo-activation.{so,a}, and Bonobo_module.{so,a}</seg>
+        <seg>&gnome-etc-dir;/bonobo-activation,
+        <envar>$GNOME_PREFIX</envar>/{include/{bonobo-activation-2.0/bonobo-activation,
+        libbonobo-2.0/bonobo},lib/{bonobo-2.0/samples,bonobo/{monikers,
+        servers}},share/{gtk-doc/html/{bonobo-activation,libbonobo},
+        idl/{bonobo-2.0,bonobo-activation-2.0}}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libbonobo-2">
+        <term><filename class='libraryfile'>libbonobo-2.{so,a}</filename></term>
+        <listitem>
+          <para>are a set of language and system independent CORBA interfaces
+          for creating reusable components and compound documents.</para>
+          <indexterm zone="libbonobo libbonobo-2">
+            <primary sortas="c-libbonobo-2">libbonobo-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/libbonoboui.xml
===================================================================
--- gnome/deprecated/libbonoboui.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/libbonoboui.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libbonoboui-download-http "&gnome-download-http;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-download-ftp  "&gnome-download-ftp;/libbonoboui/2.24/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-md5sum        "3a754b1df0a4d5fd4836a05020a0bb4a">
+  <!ENTITY libbonoboui-size          "905 KB">
+  <!ENTITY libbonoboui-buildsize     "33 MB">
+  <!ENTITY libbonoboui-time          "1.0 SBU">
+]>
+
+<sect1 id="libbonoboui" xreflabel="libbonoboui-&libbonoboui-version;">
+  <?dbhtml filename="libbonoboui.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libbonoboui-&libbonoboui-version;</title>
+
+  <indexterm zone="libbonoboui">
+    <primary sortas="a-Libbonoboui">Libbonoboui</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libbonoboui</title>
+
+    <para>The <application>libbonoboui</application> package contains
+    <filename class="libraryfile">libbonoboui</filename> libraries.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libbonoboui-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libbonoboui-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libbonoboui-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libbonoboui-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libbonoboui-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libbonoboui-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libbonoboui Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libglade"/>,
+    <xref linkend="libgnome"/>, and
+    <xref linkend="libgnomecanvas"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libbonoboui"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libbonoboui</title>
+
+    <para>Install <application>libbonoboui</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+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>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>bonobo-browser and test-moniker</seg>
+        <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/libbonoboui-2.0/bonobo,
+        share/{doc/libbonoboui-2.24.3,gnome-2.0/ui,
+        gtk-doc/html/libbonoboui}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libbonoboui-2">
+        <term><filename class='libraryfile'>libbonoboui-2.{so,a}</filename></term>
+        <listitem>
+          <para>are the GUI portion of the <application>Bonobo</application>
+          libraries.</para>
+          <indexterm zone="libbonoboui libbonoboui-2">
+            <primary sortas="c-">libbonoboui-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/libgnome.xml
===================================================================
--- gnome/deprecated/libgnome.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/libgnome.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-md5sum        "1f85adc40b242b953c0e96ad017c2616">
+  <!ENTITY libgnome-size          "1.7 MB">
+  <!ENTITY libgnome-buildsize     "28 MB">
+  <!ENTITY libgnome-time          "0.4 SBU">
+]>
+
+<sect1 id="libgnome" xreflabel="libgnome-&libgnome-version;">
+  <?dbhtml filename="libgnome.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgnome-&libgnome-version;</title>
+
+  <indexterm zone="libgnome">
+    <primary sortas="a-Libgnome">Libgnome</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgnome</title>
+
+    <para>The <application>libgnome</application> package contains the
+    <filename class="libraryfile">libgnome</filename> library.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgnome-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgnome-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgnome-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgnome-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgnome-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgnome-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgnome Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libbonobo"/> and
+    <xref linkend="gnome-vfs"/></para>
+
+    <bridgehead renderas="sect4">Recommended (if you plan on installing the
+    GNOME desktop)</bridgehead>
+    <para role="recommended"><xref linkend="esound"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnome"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgnome</title>
+
+    <para>Install <application>libgnome</application> by running the following
+    commands:</para>
+
+<screen><userinput>
+./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-old-etc-dir;                                \
+            --localstatedir=/var/lib                           \
+            --mandir=$(pkg-config --variable=prefix ORBit-2.0)/share/man &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <para><parameter>--localstatedir=/var/lib</parameter>: This
+    parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
+    <filename class='directory'>/var/lib</filename> instead
+    of <filename class='directory'>$GNOME_PREFIX/var</filename>
+    to synchronize with the <application>GNOME Games</application>
+    installation and properly record high scores in
+    <filename class='directory'>/var/lib/games</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>
+
+    <para><option>--disable-esd</option>: This parameter is required if
+    <xref linkend="esound"/> is not installed.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-open</seg>
+        <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} (bonobo
+        library)</seg>
+        <seg>&gnome-etc-dir;/sound/events,
+        <envar>$GNOME_PREFIX</envar>/{include/libgnome-2.0/libgnome,
+        share/gtk-doc/html/libgnome}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgnome-2">
+        <term><filename class='libraryfile'>libgnome-2.{so,a}</filename></term>
+        <listitem>
+          <para>are the non-GUI portion of the <application>GNOME</application>
+          libraries.</para>
+          <indexterm zone="libgnome libgnome-2">
+            <primary sortas="c-libgnome-2">libgnome-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/libgnomecanvas.xml
===================================================================
--- gnome/deprecated/libgnomecanvas.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/libgnomecanvas.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libgnomecanvas-download-http "&gnome-download-http;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
+  <!ENTITY libgnomecanvas-download-ftp  "&gnome-download-ftp;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
+  <!ENTITY libgnomecanvas-md5sum        "362ab7b81024b3c3b4a712e7df01b169">
+  <!ENTITY libgnomecanvas-size          "570 KB">
+  <!ENTITY libgnomecanvas-buildsize     "16 MB">
+  <!ENTITY libgnomecanvas-time          "0.4 SBU">
+]>
+
+<sect1 id="libgnomecanvas" xreflabel="libgnomecanvas-&libgnomecanvas-version;">
+  <?dbhtml filename="libgnomecanvas.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgnomecanvas-&libgnomecanvas-version;</title>
+
+  <indexterm zone="libgnomecanvas">
+    <primary sortas="a-Libgnomecanvas">Libgnomecanvas</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgnomecanvas</title>
+
+    <para>The <application>libgnomecanvas</application> package contains
+    the <application>GNOME</application> canvas library.
+    It is an engine for structured graphics and one of the essential
+    <application>GNOME</application> libraries.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgnomecanvas-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgnomecanvas-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgnomecanvas-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgnomecanvas-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgnomecanvas-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgnomecanvas-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgnomecanvas Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gtk2"/>,
+    <xref linkend="intltool"/>, and
+    <xref linkend="libart_lgpl"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/> and
+    <xref linkend="libglade"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomecanvas"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgnomecanvas</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/without-gnome.xml"/>
+
+    <para>Install <application>libgnomecanvas</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgnomecanvas-2.{so,a}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomecanvas-2.0/libgnomecanvas,
+        share/gtk-doc/html/libgnomecanvas}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/libgnomeui.xml
===================================================================
--- gnome/deprecated/libgnomeui.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/libgnomeui.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libgnomeui-download-http "&gnome-download-http;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/2.24/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-md5sum        "ceab6f4370581d1a03c09f15cc103099">
+  <!ENTITY libgnomeui-size          "1.3 MB">
+  <!ENTITY libgnomeui-buildsize     "41 MB">
+  <!ENTITY libgnomeui-time          "0.7 SBU">
+]>
+
+<sect1 id="libgnomeui" xreflabel="libgnomeui-&libgnomeui-version;">
+  <?dbhtml filename="libgnomeui.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgnomeui-&libgnomeui-version;</title>
+
+  <indexterm zone="libgnomeui">
+    <primary sortas="a-Libgnomeui">Libgnomeui</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgnomeui</title>
+
+    <para>The <application>libgnomeui</application> package contains
+    <filename class="libraryfile">libgnomeui</filename> libraries.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgnomeui-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgnomeui-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgnomeui-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgnomeui-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgnomeui-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgnomeui-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgnomeui Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libbonoboui"/>,
+    <xref linkend="libgnome-keyring"/>, and
+    <xref linkend="xorg7-lib"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libjpeg"/>,
+    <xref linkend="esound"/>, and
+    <xref linkend="gtk-doc"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgnomeui"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgnomeui</title>
+
+    <para>Install <application>libgnomeui</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/libgnomeui &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    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>
+
+    <para><option>--with-kde-datadir=$KDE_PREFIX/share</option>: Use this
+    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/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring libgnomeui</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>Some applications cannot properly discover the
+      <application>libglade</application> interface library installed by
+      <application>libgnomeui</application>. Get around this problem by
+      initializing an environment variable which identifies the location
+      of the library. Add the following line to the system-wide
+      <filename>/etc/profile</filename> file, or to individual user's
+      <filename>~/.profile</filename> or <filename>~/.bashrc</filename>
+      files:</para>
+
+<screen><literal>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</literal></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgnomeui-2.{so,a} and libgnome.{so,a} Glade library</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomeui-2.0/libgnomeui,
+        share/gtk-doc/html/libgnomeui}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgnomeui-2">
+        <term><filename class='libraryfile'>libgnomeui-2.{so,a}</filename></term>
+        <listitem>
+          <para>are the GUI portion of the <application>GNOME</application>
+          libraries.</para>
+          <indexterm zone="libgnomeui libgnomeui-2">
+            <primary sortas="c-libgnomeui-2">libgnomeui-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/deprecated/orbit2.xml
===================================================================
--- gnome/deprecated/orbit2.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ gnome/deprecated/orbit2.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY ORBit2-download-http "&gnome-download-http;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-download-ftp  "&gnome-download-ftp;/ORBit2/2.14/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-md5sum        "7082d317a9573ab338302243082d10d1">
+  <!ENTITY ORBit2-size          "764 KB">
+  <!ENTITY ORBit2-buildsize     "35 MB">
+  <!ENTITY ORBit2-time          "0.6 SBU">
+]>
+
+<sect1 id="ORBit2" xreflabel="ORBit2-&ORBit2-version;">
+  <?dbhtml filename="ORBit2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ORBit2-&ORBit2-version;</title>
+
+  <indexterm zone="ORBit2">
+    <primary sortas="a-ORBit2">ORBit2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ORBit2</title>
+
+    <para>The <application>ORBit2</application> package contains a
+    high-performance CORBA Object Request Broker. This allows programs
+    to send requests and receive replies from other programs.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome2.xml"/>
+
+    &lfs65_checked;
+ 
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ORBit2-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ORBit2-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ORBit2-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ORBit2-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ORBit2-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ORBit2-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ORBit2 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libidl"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/> and
+    <xref linkend="openssl"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/orbit2"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ORBit2</title>
+
+    <para>Install <application>ORBit2</application> by running
+    the following commands:</para>
+
+    <para>Run the following commands:</para>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=&gnome-old-etc-dir; &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the base
+    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
+    install directory as described in the introduction of this Chapter.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>ior-decode-2, linc-cleanup-sockets, orbit-idl-2,
+        orbit2-config and typelib-dump</seg>
+        <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><envar>$GNOME_PREFIX</envar>/{include/orbit-2.0/*,lib/orbit-2.0,
+        share/{gtk-doc/html/ORBit2,idl/orbit-2.0}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libORBit-2">
+        <term><filename class='libraryfile'>libORBit-2.{so,a}</filename></term>
+        <listitem>
+          <para>is the CORBA API.</para>
+          <indexterm zone="ORBit2 libORBit-2">
+            <primary sortas="c-libORBit-2">libORBit-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ gnome/gnome.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -19,4 +19,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
+  <!-- transitionally, gnome-2 packages used elsewhere -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deprecated/deprecated.xml"/>
 
   <!-- Obsoleting the GNOME-1.4 stuff
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ introduction/welcome/changelog.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -42,4 +42,16 @@
 
 -->
+    <listitem>
+      <para>January 25th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Move some gnome2 packages to a new deprecated
+          chapter, and move gnome-media to audioutils.  This is the
+          beginning of the move from gnome-2 to gnome-3, instructions and
+          links may be broken in the gnome chapters for the moment.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 20th, 2012</para>
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ multimedia/audioutils/audioutils.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -31,4 +31,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audacious.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amarok.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-media.xml"/>
 
 </chapter>
Index: multimedia/audioutils/gnome-media.xml
===================================================================
--- multimedia/audioutils/gnome-media.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ multimedia/audioutils/gnome-media.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-md5sum        "027b11fb8b126ab1b25def6b9e121bd3">
+  <!ENTITY gnome-media-size          "2.6 MB">
+  <!ENTITY gnome-media-buildsize     "35 MB">
+  <!ENTITY gnome-media-time          "0.5 SBU">
+]>
+
+<sect1 id="gnome-media" xreflabel="GNOME Media-&gnome-media-version;">
+  <?dbhtml filename="gnome-media.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GNOME Media-&gnome-media-version;</title>
+
+  <indexterm zone="gnome-media">
+    <primary sortas="a-GNOME Media">GNOME Media</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Media</title>
+
+    <para>The <application>GNOME Media</application> package contains
+    <application>GNOME</application>'s media applications.</para>
+
+    &lfs65_built;
+
+    <para>This is a legacy GNOME-2 package which has been deprecated by the
+    GNOME developers and will be removed from the book in due course. If you
+    are not building a GNOME desktop, this can provide a volume control / mixer
+    application, but you may wish to consider simpler alternatives:</para>
+
+    <para><ulink url="http://volumecontrol.sourceforge.net/">volumecontrol</ulink>,
+    is a simple volume control and mixer which requires
+    <xref linkend="gtk2"/>, and
+    <xref linkend="alsa-utils"/>. Use ./autogen.sh to configure it.</para>
+
+    <para><ulink url="http://gvolwheel.sourceforge.net/">gvolwheel</ulink>
+    provides a volume control in a tray icon, for minimalist desktops. It uses
+    <xref linkend="intltool"/>, <xref linkend="perl-xml-parser"/>, and there are
+    different versions for <xref linkend="gtk2"/> (0.7) or
+    <xref linkend="gtk3"/> (0.9).</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-media-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-media-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-media-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-media-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-media-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-media-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="GConf"/>,
+      <xref linkend="gnome-doc-utils"/>
+      <xref linkend="gstreamer"/>,
+      <xref linkend="gtk2"/>, and
+      yy<xref linkend="which"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
+         recorder),
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libunique"/>,
+      <xref linkend="pulseaudio"/>, and
+      <xref linkend="rarian"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-media"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Media</title>
+
+    <para>Install <application>GNOME Media</application> by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-old-etc-dir; \
+            --localstatedir=/var/lib \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-media &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
+    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
+    wish to disable the updates to the scrollkeeper database.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-audio-profiles-properties, gnome-sound-recorder,
+        gnome-volume-control, and gstreamer-properties</seg>
+        <seg>libgnome-media-profiles.{so,a}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-media/profiles,
+        share/{gnome-media/{pixmaps,sounds},gnome-sound-recorder/ui,
+        gnome/help/{gnome-audio-profiles/*,gnome-sound-recorder/*,
+        gnome-volume-control/*,gstreamer-properties/*},
+        gstreamer-properties/icons,omf/{gnome-audio-profiles,
+        gnome-sound-recorder,gnome-volume-control,gstreamer-properties},
+        sounds/gnome/default/alerts}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-sound-recorder">
+        <term><command>gnome-sound-recorder</command></term>
+        <listitem>
+          <para>is <application>GNOME</application>'s recorder.</para>
+          <indexterm zone="gnome-media gnome-sound-recorder">
+            <primary sortas="b-gnome-sound-recorder">gnome-sound-recorder</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-volume-control">
+        <term><command>gnome-volume-control</command></term>
+        <listitem>
+          <para>is <application>GNOME</application>'s mixer with volume
+          applet.</para>
+          <indexterm zone="gnome-media gnome-volume-control">
+            <primary sortas="b-gnome-volume-control">gnome-volume-control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gstreamer-properties">
+        <term><command>gstreamer-properties</command></term>
+        <listitem>
+          <para>is a GUI front-end to <application>GStreamer</application>'s
+          audio/video input/output parameters.</para>
+          <indexterm zone="gnome-media gstreamer-properties">
+            <primary sortas="b-gstreamer-properties">gstreamer-properties</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: xincludes/gnome-mandir.xml
===================================================================
--- xincludes/gnome-mandir.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xincludes/gnome-mandir.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -9,8 +9,10 @@
          $Date$ -->
 
-    <para><parameter>--mandir=$(pkg-config --variable=prefix
-    ORBit-2.0)/share/man</parameter>: This parameter causes the
-    <filename>man.(X)</filename> files to be installed in
-    <filename class="directory">$GNOME_PREFIX/share/man/man(X)</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/man/man(X)</filename>.</para>
+    <!-- FIXME:ken - any use is probably no longer required, everything so far
+    that I've looked at actually goes into prefix/share/man - but I haven't built
+    them all, so far -->
+    <para><parameter>--mandir=<envar>$GNOME_PREFIX</envar>/share/man</parameter>:
+    This parameter causes the <filename>man.(X)</filename> files to be installed
+    in <filename class="directory">$GNOME_PREFIX/share/man/man(X)</filename>
+    instead of <filename
+    class="directory">$GNOME_PREFIX/man/man(X)</filename>.</para>
Index: xincludes/gnome-old-sysconfdir.xml
===================================================================
--- xincludes/gnome-old-sysconfdir.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ xincludes/gnome-old-sysconfdir.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+    <!-- $LastChangedBy: randy $
+         $Date: 2007-04-04 20:42:53 +0100 (Wed, 04 Apr 2007) $ -->
+
+    <para><parameter>--sysconfdir=<envar>&gnome-etc-dir;</envar></parameter>:
+    This parameter causes the configuration files to be installed in
+    <filename class="directory">/etc/gnome/2.30.2</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/etc</filename>.  You may
+    prefer to use a simpler value such as
+    <filename class="directory">/etc/gnome</filename> or even
+    <filename class="directory">/etc</filename>.</para>
Index: xincludes/gnome-prefix.xml
===================================================================
--- xincludes/gnome-prefix.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xincludes/gnome-prefix.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -6,7 +6,6 @@
          $Date$ -->
 
-    <para><parameter>--prefix=$(pkg-config --variable=prefix
-    ORBit-2.0)</parameter>: Setting the prefix using this parameter instead of
-    with <envar>$GNOME_PREFIX</envar> will ensure that the prefix is
-    consistent with the installation environment and the package will be
-    installed in the correct location.</para>
+    <para><parameter>--prefix=<envar>$GNOME_PREFIX</envar></parameter>: Setting
+    the prefix using this parameter will ensure that the prefix is consistent
+    with the installation environment and the package will be installed in the
+    correct location.</para>
Index: xincludes/gnome-sysconfdir.xml
===================================================================
--- xincludes/gnome-sysconfdir.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xincludes/gnome-sysconfdir.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -9,8 +9,6 @@
          $Date$ -->
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
-    causes the configuration files to be installed in
-    <filename class="directory">&gnome-etc-dir;</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/etc</filename>. Additionally
-    (if applicable), the parameter ensures that the
-    <application>GConf</application>-2 database is correctly updated.</para>
+    <para><parameter>--sysconfdir=<envar>$GNOME_SYSCONFDIR</envar></parameter>:
+    Setting the sysconfdir using this parameter will ensure that the sysconfdir
+    is consistent with the installation environment and the package will be
+    installed in the correct location.</para>
Index: xincludes/gnome2.xml
===================================================================
--- xincludes/gnome2.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
+++ xincludes/gnome2.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <!-- $LastChangedBy$
+         $Date$ -->
+
+
+<note>
+<para>This is a legacy <application>GNOME-2</application> package which has
+been deprecated by the <application>GNOME</application> developers and will
+be removed from the book in due course.  Please ensure that you really want
+or need it before you build it.</para>
+</note>
Index: xincludes/without-gnome.xml
===================================================================
--- xincludes/without-gnome.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xincludes/without-gnome.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -7,9 +7,10 @@
 
 <note>
-  <para>The instructions below are based on installing the package into a
-  GNOME-2 environment. If, for whatever reason, you're installing this package
-  without having <application>ORBit2</application> and the core GNOME-2
-  libraries installed, you'll need to modify the <option>--prefix=</option>
-  parameter on the <command>configure</command> script to point to your desired
-  installation path (e.g., <option>--prefix=/usr</option>).</para>
+    <para>The instructions below are based on installing the package into a
+    <application>GNOME</application> environment. If, for whatever reason,
+    you're installing this package without having the core
+    <application>GNOME</application> libraries installed, you'll need to modify
+    the <option>--prefix=</option> parameter on the <command>configure</command>
+    script to point to your desired installation path (e.g.,
+    <option>--prefix=/usr</option>).</para>
 </note>
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xsoft/office/gnucash.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -118,5 +118,5 @@
     commands:</para>
 
-<screen><userinput>sed -i 's|xml::${sysconfdir}|xml::&gnome-etc-dir;|' configure &amp;&amp;
+<screen><userinput>sed -i 's|xml::${sysconfdir}|xml::&gnome-old-etc-dir;|' configure &amp;&amp;
 
 ./configure \
@@ -124,5 +124,5 @@
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
-    --with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas &amp;&amp;
+    --with-gconf-schema-file-dir=&gnome-old-etc-dir;/gconf/schemas &amp;&amp;
 make</userinput></screen>
 
@@ -219,5 +219,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's|xml::${sysconfdir}|xml::&gnome-etc-dir;|'
+    <para><command>sed -i 's|xml::${sysconfdir}|xml::&gnome-old-etc-dir;|'
     configure</command>: This command is used because the location of the
     <application>GConf</application> source database is hard-coded into
@@ -234,5 +234,5 @@
     <filename class='directory'>/usr/etc/gnucash</filename>.</para>
 
-    <para><parameter>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</parameter>:
+    <para><parameter>--with-gconf-schema-file-dir=&gnome-old-etc-dir;/gconf/schemas</parameter>:
     This parameter ensures that the <application>GConf</application> schema
     files are installed in the proper location instead of
Index: xsoft/office/gnumeric.xml
===================================================================
--- xsoft/office/gnumeric.xml	(revision 4949485eb7dda9e54aa01279909dc5f0c69358ea)
+++ xsoft/office/gnumeric.xml	(revision 8d3eae9ab418fd62dfae9fad098e2a2ad810f9ed)
@@ -107,5 +107,5 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp; \
+            --sysconfdir=&gnome-old-etc-dir; &amp;&amp; \
 make</userinput></screen>
 
@@ -129,5 +129,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
