Index: general.ent
===================================================================
--- general.ent	(revision 790998f81db95bcfbae7cc14f12739299e077b6c)
+++ general.ent	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
@@ -645,5 +645,4 @@
 <!ENTITY gnome-games-version          "2.30.2">
 <!ENTITY gnome-media-version          "2.30.0">
-<!ENTITY gnome-mount-version          "0.8">
 <!ENTITY gnome-netstatus-version      "2.28.1">
 <!ENTITY gnome-nettool-version        "2.30.0">
@@ -687,4 +686,5 @@
 <!ENTITY gail-version                 "1.22.3">
 <!ENTITY gnome-keyring-manager-version "2.18.0">
+<!ENTITY gnome-mount-version          "0.8">
 -->
 
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 790998f81db95bcfbae7cc14f12739299e077b6c)
+++ gnome/add/add.xml	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
@@ -56,5 +56,4 @@
   <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-mount.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"/>
@@ -98,4 +97,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gail.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-mount.xml"/>
   -->
 
Index: ome/add/gnome-mount.xml
===================================================================
--- gnome/add/gnome-mount.xml	(revision 790998f81db95bcfbae7cc14f12739299e077b6c)
+++ 	(revision )
@@ -1,177 +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-mount-download-http "http://hal.freedesktop.org/releases/gnome-mount-&gnome-mount-version;.tar.gz">
-  <!ENTITY gnome-mount-download-ftp  " ">
-  <!ENTITY gnome-mount-md5sum        "562ec9d0196e5e000bdd249a04a3aa6a">
-  <!ENTITY gnome-mount-size          "494 KB">
-  <!ENTITY gnome-mount-buildsize     "5 MB">
-  <!ENTITY gnome-mount-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-mount" xreflabel="gnome-mount-&gnome-mount-version;">
-  <?dbhtml filename="gnome-mount.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-mount-&gnome-mount-version;</title>
-
-  <indexterm zone="gnome-mount">
-    <primary sortas="a-gnome-mount">gnome-mount</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-mount</title>
-
-    <para>The <application>gnome-mount</application> package contains programs
-    for mounting, unmounting and ejecting storage devices. The goal for
-    <application>gnome-mount</application> is to get the appropriate GNOME
-    software (such as <application>gnome-volume-manager</application> and
-    <application>GNOME-VFS</application>) to use this instead of invoking
-    <command>mount</command>/<command>umount</command>/<command>eject</command>
-    or direct <application>HAL</application> invoking methods.</para>
-
-    <para>All the <application>gnome-mount</application> programs utilize the
-    methods on <application>HAL</application> and as such run unprivileged. The
-    rationale for <application>gnome-mount</application> is to have a
-    centralized place (in <application>GConf</application>) where settings
-    (e.g., mount options and mount locations) are maintained.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-mount-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-mount-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-mount-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-mount-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-mount-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-mount-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-mount Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-keyring"/>,
-    <xref linkend="hal"/>,
-    <xref linkend="libglade"/>,
-    <xref linkend="libnotify"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="nautilus"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-mount"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-mount</title>
-
-    <para>Install <application>gnome-mount</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &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><option>--disable-nautilus-extension</option>: Use this option if you
-    do not have <application>Nautilus</application> installed. This will prevent
-    the <application>Nautilus</application> extension from being built.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-eject, gnome-mount and gnome-umount</seg>
-        <seg>libgnome-mount.{so,a} Nautilus extention</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/gnome-mount</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-mount-prog">
-        <term><command>gnome-mount</command></term>
-        <listitem>
-          <para>is used to automatically mount storage media and other
-          removable media.</para>
-          <indexterm zone="gnome-mount gnome-mount-prog">
-            <primary sortas="b-gnome-mount">gnome-mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-umount">
-        <term><command>gnome-umount</command></term>
-        <listitem>
-          <para>is a symbolic link to <command>gnome-mount</command> used to
-          automatically unmount storage media and other removable media.</para>
-          <indexterm zone="gnome-mount gnome-umount">
-            <primary sortas="g-gnome-umount">gnome-umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-eject">
-        <term><command>gnome-eject</command></term>
-        <listitem>
-          <para>is a symbolic link to <command>gnome-mount</command> used to
-          automatically open and close (if supported by the drive) the drive
-          door and tray in CD/DVD drives.</para>
-          <indexterm zone="gnome-mount gnome-eject">
-            <primary sortas="b-gnome-eject">gnome-eject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/add/obsolete/gnome-mount.xml
===================================================================
--- gnome/add/obsolete/gnome-mount.xml	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
+++ gnome/add/obsolete/gnome-mount.xml	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
@@ -0,0 +1,177 @@
+<?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-mount-download-http "http://hal.freedesktop.org/releases/gnome-mount-&gnome-mount-version;.tar.gz">
+  <!ENTITY gnome-mount-download-ftp  " ">
+  <!ENTITY gnome-mount-md5sum        "562ec9d0196e5e000bdd249a04a3aa6a">
+  <!ENTITY gnome-mount-size          "494 KB">
+  <!ENTITY gnome-mount-buildsize     "5 MB">
+  <!ENTITY gnome-mount-time          "0.1 SBU">
+]>
+
+<sect1 id="gnome-mount" xreflabel="gnome-mount-&gnome-mount-version;">
+  <?dbhtml filename="gnome-mount.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-mount-&gnome-mount-version;</title>
+
+  <indexterm zone="gnome-mount">
+    <primary sortas="a-gnome-mount">gnome-mount</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to gnome-mount</title>
+
+    <para>The <application>gnome-mount</application> package contains programs
+    for mounting, unmounting and ejecting storage devices. The goal for
+    <application>gnome-mount</application> is to get the appropriate GNOME
+    software (such as <application>gnome-volume-manager</application> and
+    <application>GNOME-VFS</application>) to use this instead of invoking
+    <command>mount</command>/<command>umount</command>/<command>eject</command>
+    or direct <application>HAL</application> invoking methods.</para>
+
+    <para>All the <application>gnome-mount</application> programs utilize the
+    methods on <application>HAL</application> and as such run unprivileged. The
+    rationale for <application>gnome-mount</application> is to have a
+    centralized place (in <application>GConf</application>) where settings
+    (e.g., mount options and mount locations) are maintained.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-mount-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-mount-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-mount-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-mount-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-mount-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-mount-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">gnome-mount Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gnome-keyring"/>,
+    <xref linkend="hal"/>,
+    <xref linkend="libglade"/>,
+    <xref linkend="libnotify"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="nautilus"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-mount"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of gnome-mount</title>
+
+    <para>Install <application>gnome-mount</application> by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; &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><option>--disable-nautilus-extension</option>: Use this option if you
+    do not have <application>Nautilus</application> installed. This will prevent
+    the <application>Nautilus</application> extension from being built.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-eject, gnome-mount and gnome-umount</seg>
+        <seg>libgnome-mount.{so,a} Nautilus extention</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/share/gnome-mount</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-mount-prog">
+        <term><command>gnome-mount</command></term>
+        <listitem>
+          <para>is used to automatically mount storage media and other
+          removable media.</para>
+          <indexterm zone="gnome-mount gnome-mount-prog">
+            <primary sortas="b-gnome-mount">gnome-mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-umount">
+        <term><command>gnome-umount</command></term>
+        <listitem>
+          <para>is a symbolic link to <command>gnome-mount</command> used to
+          automatically unmount storage media and other removable media.</para>
+          <indexterm zone="gnome-mount gnome-umount">
+            <primary sortas="g-gnome-umount">gnome-umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-eject">
+        <term><command>gnome-eject</command></term>
+        <listitem>
+          <para>is a symbolic link to <command>gnome-mount</command> used to
+          automatically open and close (if supported by the drive) the drive
+          door and tray in CD/DVD drives.</para>
+          <indexterm zone="gnome-mount gnome-eject">
+            <primary sortas="b-gnome-eject">gnome-eject</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 790998f81db95bcfbae7cc14f12739299e077b6c)
+++ gnome/core/gnome-vfs.xml	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
@@ -77,8 +77,9 @@
     <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 <xref linkend="gnome-mount"/> package. This package is
-    not required at build-time, and is only a run-time dependency. If
+    <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,
@@ -137,8 +138,8 @@
 
     <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
-    need to be passed if you have <xref linkend="eject"/> or
-    <xref linkend="gnome-mount"/> installed, as the <command>eject</command>
-    program is used if <application>gnome-mount</application> is not
-    installed.</para>
+    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"
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 790998f81db95bcfbae7cc14f12739299e077b6c)
+++ introduction/welcome/changelog.xml	(revision da8599a3b495fcd3c4c21f9d9a5ff9c3f82c1f91)
@@ -45,4 +45,7 @@
       <itemizedlist>
         <listitem>
+          <para>[wblaszcz] - Removed gnome-mount-0.8.</para>
+        </listitem>
+        <listitem>
           <para>[wblaszcz] - Removed gnome-old-version.</para>
         </listitem>
