Index: general.ent
===================================================================
--- general.ent	(revision edb484edf1e2f14f35cb57ec431e1f35c9eb9e04)
+++ general.ent	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
@@ -545,7 +545,4 @@
 <!ENTITY gnome-mime-data-version      "2.18.0">
 <!ENTITY gnome-vfs-version            "2.24.2">
-<!-- Obsolete
-<!ENTITY gnome-vfs-monikers-version   "2.15.3">
--->
 <!ENTITY libbonobo-version            "2.24.2">
 <!ENTITY libbonoboui-version          "2.24.2">
@@ -557,5 +554,4 @@
 <!-- Desktop -->
 <!ENTITY gnome-control-center-version "2.28.1">
-<!ENTITY eel-version                  "2.18.3">
 <!ENTITY gail-version                 "1.18.0">
 <!ENTITY gnome-applets-version        "2.28.0">
@@ -581,6 +577,6 @@
 
 <!-- Libraries -->
+<!ENTITY eel-version                  "2.18.3">
 <!ENTITY evolution-data-server-version "2.28.2">
-<!ENTITY gnome-audio-version          "2.0.0">
 <!ENTITY gtkhtml-version              "3.14.3">
 <!ENTITY gtksourceview-version        "2.8.1">
@@ -637,4 +633,6 @@
 <!ENTITY gnome2-user-docs-version     "2.8.1">
 <!ENTITY gnopernicus-version          "1.1.1">
+<!ENTITY gnome-vfs-monikers-version   "2.15.3">
+<!ENTITY gnome-audio-version          "2.0.0">
 -->
 
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision edb484edf1e2f14f35cb57ec431e1f35c9eb9e04)
+++ gnome/add/add.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
@@ -25,5 +25,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="evolution-data-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-audio.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkhtml.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtksourceview.xml"/>
@@ -82,4 +81,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ggv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnopernicus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-vfs-monikers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-audio.xml"/>
   -->
 
Index: ome/add/gnome-audio.xml
===================================================================
--- gnome/add/gnome-audio.xml	(revision edb484edf1e2f14f35cb57ec431e1f35c9eb9e04)
+++ 	(revision )
@@ -1,107 +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-audio-download-http "&gnome-download-http;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
-  <!ENTITY gnome-audio-download-ftp  "&gnome-download-ftp;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
-  <!ENTITY gnome-audio-md5sum        "cd14b84af59fb2ec673527d32f4e379f">
-  <!ENTITY gnome-audio-size          "1.4 MB">
-  <!ENTITY gnome-audio-buildsize     "4.2 MB">
-  <!ENTITY gnome-audio-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome-audio" xreflabel="gnome-audio-&gnome-audio-version;">
-  <?dbhtml filename="gnome-audio.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-audio-&gnome-audio-version;</title>
-
-  <indexterm zone="gnome-audio">
-    <primary sortas="a-Gnome-audio">Gnome-audio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-audio</title>
-
-    <para>The <application>gnome-audio</application> package contains a set
-    of default sounds for the <application>GNOME</application> GUI desktop.
-    Sound files for startup, shutdown and many GTK+ events are included.
-    These sounds complement the <application>GNOME Media</application>
-    package.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-audio-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-audio-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-audio-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-audio-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-audio-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-audio-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-audio"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-audio</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
-    <para>Install <application>gnome-audio</application> by running the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make prefix=$(pkg-config --variable=prefix ORBit-2.0) install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/sounds</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: gnome/add/obsolete/gnome-audio.xml
===================================================================
--- gnome/add/obsolete/gnome-audio.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
+++ gnome/add/obsolete/gnome-audio.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
@@ -0,0 +1,107 @@
+<?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-audio-download-http "&gnome-download-http;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
+  <!ENTITY gnome-audio-download-ftp  "&gnome-download-ftp;/gnome-audio/2.0/gnome-audio-&gnome-audio-version;.tar.bz2">
+  <!ENTITY gnome-audio-md5sum        "cd14b84af59fb2ec673527d32f4e379f">
+  <!ENTITY gnome-audio-size          "1.4 MB">
+  <!ENTITY gnome-audio-buildsize     "4.2 MB">
+  <!ENTITY gnome-audio-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gnome-audio" xreflabel="gnome-audio-&gnome-audio-version;">
+  <?dbhtml filename="gnome-audio.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-audio-&gnome-audio-version;</title>
+
+  <indexterm zone="gnome-audio">
+    <primary sortas="a-Gnome-audio">Gnome-audio</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to gnome-audio</title>
+
+    <para>The <application>gnome-audio</application> package contains a set
+    of default sounds for the <application>GNOME</application> GUI desktop.
+    Sound files for startup, shutdown and many GTK+ events are included.
+    These sounds complement the <application>GNOME Media</application>
+    package.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-audio-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-audio-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-audio-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-audio-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-audio-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-audio-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-audio"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of gnome-audio</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/without-gnome.xml"/>
+
+    <para>Install <application>gnome-audio</application> by running the
+    following command as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>make prefix=$(pkg-config --variable=prefix ORBit-2.0) install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <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>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/sounds</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: gnome/add/obsolete/gnome-vfs-monikers.xml
===================================================================
--- gnome/add/obsolete/gnome-vfs-monikers.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
+++ gnome/add/obsolete/gnome-vfs-monikers.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
@@ -0,0 +1,114 @@
+<?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-monikers-download-http "&gnome-download-http;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
+  <!ENTITY gnome-vfs-monikers-download-ftp  "&gnome-download-ftp;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
+  <!ENTITY gnome-vfs-monikers-md5sum        "b16f0db0482263be3318e269f52bb5b6">
+  <!ENTITY gnome-vfs-monikers-size          "254 KB">
+  <!ENTITY gnome-vfs-monikers-buildsize     "4 MB">
+  <!ENTITY gnome-vfs-monikers-time          ".1 SBU">
+]>
+
+<sect1 id="gnome-vfs-monikers" xreflabel="GNOME VFS Monikers-&gnome-vfs-monikers-version;">
+  <?dbhtml filename="gnome-vfs-monikers.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GNOME VFS Monikers-&gnome-vfs-monikers-version;</title>
+
+  <indexterm zone="gnome-vfs-monikers">
+    <primary sortas="a-GNOME-VFS-Monikers">GNOME VFS Monikers</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME VFS Monikers</title>
+
+    <para>The <application>GNOME VFS Monikers</application> package
+    contains <application>Bonobo</application> monikers that were pulled out
+    of the GNOME VFS package during the <application>Bonobo</application> to
+    <application>D-Bus</application> conversion. This package is required so
+    that the <application>GNOME VFS</application> API/ABI remains
+    stable.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-vfs-monikers-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-vfs-monikers-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-vfs-monikers-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-vfs-monikers-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-vfs-monikers-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-vfs-monikers-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME VFS Monikers Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libbonobo"/> and
+    <xref linkend="gnome-vfs"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-vfs-monikers"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME VFS Monikers</title>
+
+    <para>Install <application>GNOME VFS Monikers</application>
+    by running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &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/2003/XInclude"
+    href="../../xincludes/gnome-prefix.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>libmoniker_gnome_vfs_std.{so,a} (bonobo library)</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: ome/core/gnome-vfs-monikers.xml
===================================================================
--- gnome/core/gnome-vfs-monikers.xml	(revision edb484edf1e2f14f35cb57ec431e1f35c9eb9e04)
+++ 	(revision )
@@ -1,114 +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-monikers-download-http "&gnome-download-http;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
-  <!ENTITY gnome-vfs-monikers-download-ftp  "&gnome-download-ftp;/gnome-vfs-monikers/2.15/gnome-vfs-monikers-&gnome-vfs-monikers-version;.tar.bz2">
-  <!ENTITY gnome-vfs-monikers-md5sum        "b16f0db0482263be3318e269f52bb5b6">
-  <!ENTITY gnome-vfs-monikers-size          "254 KB">
-  <!ENTITY gnome-vfs-monikers-buildsize     "4 MB">
-  <!ENTITY gnome-vfs-monikers-time          ".1 SBU">
-]>
-
-<sect1 id="gnome-vfs-monikers" xreflabel="GNOME VFS Monikers-&gnome-vfs-monikers-version;">
-  <?dbhtml filename="gnome-vfs-monikers.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GNOME VFS Monikers-&gnome-vfs-monikers-version;</title>
-
-  <indexterm zone="gnome-vfs-monikers">
-    <primary sortas="a-GNOME-VFS-Monikers">GNOME VFS Monikers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME VFS Monikers</title>
-
-    <para>The <application>GNOME VFS Monikers</application> package
-    contains <application>Bonobo</application> monikers that were pulled out
-    of the GNOME VFS package during the <application>Bonobo</application> to
-    <application>D-Bus</application> conversion. This package is required so
-    that the <application>GNOME VFS</application> API/ABI remains
-    stable.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-vfs-monikers-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-vfs-monikers-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-vfs-monikers-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-vfs-monikers-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-vfs-monikers-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-vfs-monikers-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME VFS Monikers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libbonobo"/> and
-    <xref linkend="gnome-vfs"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-vfs-monikers"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME VFS Monikers</title>
-
-    <para>Install <application>GNOME VFS Monikers</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &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/2003/XInclude"
-    href="../../xincludes/gnome-prefix.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>libmoniker_gnome_vfs_std.{so,a} (bonobo library)</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision edb484edf1e2f14f35cb57ec431e1f35c9eb9e04)
+++ introduction/welcome/changelog.xml	(revision 0dd3ad2ceb4b168d3ca2d90c8f0b5d8a83c63156)
@@ -43,4 +43,13 @@
 
     <listitem>
+      <para>January 13th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[wblaszcz] - Removed gnome-audio-2.0.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 12th, 2010</para>
       <itemizedlist>
