Index: gnome.ent
===================================================================
--- gnome.ent	(revision 77560d37173584571e4ce25a51b9ed659f4c332b)
+++ gnome.ent	(revision a4a81fd9b22817bd7d9d333a87e85f4655d6b163)
@@ -49,4 +49,5 @@
 <!ENTITY gnome-backgrounds-version         "3.20">
 <!ENTITY gvfs-version                      "1.28.2">
+<!ENTITY nautilus-version                  "3.20.1">
 <!ENTITY gnome-keyring-version             "3.20.0">
 <!ENTITY adwaita-icon-theme-version        "3.20">
@@ -75,5 +76,4 @@
 <!ENTITY gnome-terminal-version         "3.20.2">
 <!ENTITY gucharmap-version              "9.0.0">
-<!ENTITY nautilus-version               "3.20.1">
 <!ENTITY network-manager-applet-version "1.2.2">
 <!ENTITY seahorse-version               "3.20.0">
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 77560d37173584571e4ce25a51b9ed659f4c332b)
+++ gnome/applications/applications.xml	(revision a4a81fd9b22817bd7d9d333a87e85f4655d6b163)
@@ -39,5 +39,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-terminal.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>
Index: ome/applications/nautilus.xml
===================================================================
--- gnome/applications/nautilus.xml	(revision 77560d37173584571e4ce25a51b9ed659f4c332b)
+++ 	(revision )
@@ -1,228 +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 nautilus-download-http
-           "&gnome-download-http;/nautilus/&gnome-minor-20;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-download-ftp
-           "&gnome-download-ftp;/nautilus/&gnome-minor-20;/nautilus-&nautilus-version;.tar.xz">
-  <!ENTITY nautilus-md5sum        "d25ef6e36701fc2646673bdc8f8adad2">
-  <!ENTITY nautilus-size          "3.3 MB">
-  <!ENTITY nautilus-buildsize     "98 MB">
-  <!ENTITY nautilus-time          "0.8 SBU">
-]>
-
-<sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
-  <?dbhtml filename="nautilus.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Nautilus-&nautilus-version;</title>
-
-  <indexterm zone="nautilus">
-    <primary sortas="a-Nautilus">Nautilus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nautilus</title>
-
-    <para>
-      The <application>Nautilus</application> package contains the
-      <application>GNOME</application> file manager.
-    </para>
-
-    &lfs79_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nautilus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nautilus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nautilus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nautilus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nautilus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nautilus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nautilus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnome-desktop"/> and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="exempi"/>,
-      <xref linkend="libexif"/> and
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://projects.gnome.org/tracker/">Tracker</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="adwaita-icon-theme"/>, and
-      <xref linkend="gvfs"/> (For hotplugging and device mounting to work)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/nautilus"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nautilus</title>
-
-    <para>
-      Install <application>Nautilus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-selinux    \
-            --disable-tracker    \
-            --disable-packagekit &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>
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>. The tests
-      need to be run in a graphical environment.
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-selinux</parameter>: This switch disables use
-      of selinux which isn't supported by BLFS.
-    </para>
-
-    <para>
-      <parameter>--disable-packagekit</parameter>: This switch disables use
-      of PackageKit which isn't suitable for BLFS.
-    </para>
-
-    <para>
-      <parameter>--disable-tracker</parameter>: This switch disables
-      use of <application>Tracker</application> which isn't part of
-      BLFS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-xmp</option>: Use this switch if
-      you did not install <application>Exempi</application>.
-    </para>
-
-    <para>
-      <option>--disable-libexif</option>: Use this switch if
-      you did not install <application>libexif</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nautilus and nautilus-autorun-software
-        </seg>
-        <seg>
-          libnautilus-extension.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/nautilus and
-          /usr/share/{gnome-shell/search-providers,gtk-doc/html/libnautilus-extension}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nautilus-prog">
-        <term><command>nautilus</command></term>
-        <listitem>
-          <para>
-            is the <application>GNOME</application> file manager.
-          </para>
-          <indexterm zone="nautilus nautilus-prog">
-            <primary sortas="b-nautilus">nautilus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnautilus-extension">
-        <term><filename class="libraryfile">libnautilus-extension.so</filename></term>
-        <listitem>
-          <para>
-            supplies the functions needed by the file manager extensions.
-          </para>
-          <indexterm zone="nautilus libnautilus-extension">
-            <primary sortas="c-libnautilus-extension">libnautilus-extension.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/nautilus.xml
===================================================================
--- gnome/platform/nautilus.xml	(revision a4a81fd9b22817bd7d9d333a87e85f4655d6b163)
+++ gnome/platform/nautilus.xml	(revision a4a81fd9b22817bd7d9d333a87e85f4655d6b163)
@@ -0,0 +1,228 @@
+<?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 nautilus-download-http
+           "&gnome-download-http;/nautilus/&gnome-minor-20;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-download-ftp
+           "&gnome-download-ftp;/nautilus/&gnome-minor-20;/nautilus-&nautilus-version;.tar.xz">
+  <!ENTITY nautilus-md5sum        "d25ef6e36701fc2646673bdc8f8adad2">
+  <!ENTITY nautilus-size          "3.3 MB">
+  <!ENTITY nautilus-buildsize     "98 MB">
+  <!ENTITY nautilus-time          "0.8 SBU">
+]>
+
+<sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
+  <?dbhtml filename="nautilus.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Nautilus-&nautilus-version;</title>
+
+  <indexterm zone="nautilus">
+    <primary sortas="a-Nautilus">Nautilus</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Nautilus</title>
+
+    <para>
+      The <application>Nautilus</application> package contains the
+      <application>GNOME</application> file manager.
+    </para>
+
+    &lfs79_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&nautilus-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&nautilus-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &nautilus-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &nautilus-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &nautilus-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &nautilus-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Nautilus Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gnome-desktop"/> and
+      <xref linkend="libnotify"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="exempi"/>,
+      <xref linkend="libexif"/> and
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://projects.gnome.org/tracker/">Tracker</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
+    <para role="recommended">
+      <xref linkend="adwaita-icon-theme"/>, and
+      <xref linkend="gvfs"/> (For hotplugging and device mounting to work)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/nautilus"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Nautilus</title>
+
+    <para>
+      Install <application>Nautilus</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --disable-selinux    \
+            --disable-tracker    \
+            --disable-packagekit &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>
+<!--
+    <para>
+      To test the results, issue: <command>make check</command>. The tests
+      need to be run in a graphical environment.
+    </para>-->
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-selinux</parameter>: This switch disables use
+      of selinux which isn't supported by BLFS.
+    </para>
+
+    <para>
+      <parameter>--disable-packagekit</parameter>: This switch disables use
+      of PackageKit which isn't suitable for BLFS.
+    </para>
+
+    <para>
+      <parameter>--disable-tracker</parameter>: This switch disables
+      use of <application>Tracker</application> which isn't part of
+      BLFS.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <option>--disable-xmp</option>: Use this switch if
+      you did not install <application>Exempi</application>.
+    </para>
+
+    <para>
+      <option>--disable-libexif</option>: Use this switch if
+      you did not install <application>libexif</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          nautilus and nautilus-autorun-software
+        </seg>
+        <seg>
+          libnautilus-extension.so
+        </seg>
+        <seg>
+          /usr/{include,lib}/nautilus and
+          /usr/share/{gnome-shell/search-providers,gtk-doc/html/libnautilus-extension}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="nautilus-prog">
+        <term><command>nautilus</command></term>
+        <listitem>
+          <para>
+            is the <application>GNOME</application> file manager.
+          </para>
+          <indexterm zone="nautilus nautilus-prog">
+            <primary sortas="b-nautilus">nautilus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnautilus-extension">
+        <term><filename class="libraryfile">libnautilus-extension.so</filename></term>
+        <listitem>
+          <para>
+            supplies the functions needed by the file manager extensions.
+          </para>
+          <indexterm zone="nautilus libnautilus-extension">
+            <primary sortas="c-libnautilus-extension">libnautilus-extension.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 77560d37173584571e4ce25a51b9ed659f4c332b)
+++ gnome/platform/platform.xml	(revision a4a81fd9b22817bd7d9d333a87e85f4655d6b163)
@@ -76,4 +76,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-backgrounds.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
 
