Index: general.ent
===================================================================
--- general.ent	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ general.ent	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -619,5 +619,4 @@
 <!ENTITY gnome-utils-version          "2.28.1">
 <!ENTITY gucharmap-version            "2.28.2">
-<!ENTITY nautilus-cd-burner-version   "2.18.2">
 <!ENTITY sound-juicer-version         "2.28.1">
 <!ENTITY totem-version                "2.28.4">
@@ -644,4 +643,5 @@
 <!ENTITY gnome-audio-version          "2.0.0">
 <!ENTITY gnome-volume-manager-version "2.17.0">
+<!ENTITY nautilus-cd-burner-version   "2.18.2">
 -->
 
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ general/prog/python-modules.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -962,8 +962,5 @@
       <para role="required"><xref linkend="libgtop"/></para>
 
-      <bridgehead renderas="sect5">Required (nautilusburn module)</bridgehead>
-      <para role="required"><xref linkend="nautilus-cd-burner"/></para>
-
-     <bridgehead renderas="sect5">Required (braseromedia and braseroburn modules)</bridgehead>
+      <bridgehead renderas="sect5">Required (braseromedia and braseroburn modules)</bridgehead>
       <para role="required"><xref linkend="brasero"/></para>
 
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ gnome/add/add.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -57,5 +57,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gucharmap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-cd-burner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sound-juicer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="totem.xml"/>
@@ -83,4 +82,5 @@
   <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="gnome-volume-manager.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus-cd-burner.xml"/>
   -->
 
Index: ome/add/nautilus-cd-burner.xml
===================================================================
--- gnome/add/nautilus-cd-burner.xml	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ 	(revision )
@@ -1,158 +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-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-md5sum        "fee9ec2f398a6b1eacfd59e239d06837">
-  <!ENTITY nautilus-cd-burner-size          "740 KB">
-  <!ENTITY nautilus-cd-burner-buildsize     "15 MB">
-  <!ENTITY nautilus-cd-burner-time          "0.3 SBU">
-]>
-
-<sect1 id="nautilus-cd-burner"
-xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
-  <?dbhtml filename="nautilus-cd-burner.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Nautilus CD Burner-&nautilus-cd-burner-version;</title>
-
-  <indexterm zone="nautilus-cd-burner">
-    <primary sortas="a-Nautilus-CD-Burner">Nautilus CD Burner</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nautilus CD Burner</title>
-
-    <para>The <application>Nautilus CD Burner</application> package provides
-    an easy method to write files to a CD or DVD burner with
-    <application>GNOME</application>; by drag-and-dropping files using the
-    <application>GNOME</application> file manager,
-    <application>Nautilus</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nautilus-cd-burner-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nautilus-cd-burner-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nautilus-cd-burner-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nautilus-cd-burner-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nautilus-cd-burner-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nautilus-cd-burner-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nautilus CD Burner Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="nautilus"/>
-    and <xref linkend="hal"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnome-mount"/> and
-    <xref linkend="intltool"/></para>
-
-    <para>Though <application>Nautilus CD Burner</application> happily passes
-    all the <command>configure</command> script checks and then builds
-    successfully without them, the <xref linkend="cdrtools"/> and
-    <xref linkend="dvd-rw-tools"/> packages are required to be installed or you
-    won't be able to create ISO filesystems or burn CDs and DVDs.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/NautilusCdBurner"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nautilus CD Burner</title>
-
-    <para>Install <application>Nautilus CD Burner</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/nautilus-cd-burner &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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/nautilus-cd-burner</parameter>: This parameter causes the
-    libexec files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/nautilus-cd-burner</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>nautilus-cd-burner</seg>
-        <seg>libnautilus-burn.so and gnome-vfs and nautilus modules</seg>
-        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/libnautilus-burn,
-        lib/nautilus-cd-burner and
-        share/nautilus-cd-burner</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nautilus-cd-burner-prog">
-        <term><command>nautilus-cd-burner</command></term>
-        <listitem>
-          <para>is an extension to <application>Nautilus</application>
-          that lets you burn CDs easily.</para>
-          <indexterm zone="nautilus-cd-burner nautilus-cd-burner-prog">
-            <primary sortas="b-nautilus-cd-burner">nautilus-cd-burner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/add/obsolete/nautilus-cd-burner.xml
===================================================================
--- gnome/add/obsolete/nautilus-cd-burner.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
+++ gnome/add/obsolete/nautilus-cd-burner.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -0,0 +1,158 @@
+<?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-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-md5sum        "fee9ec2f398a6b1eacfd59e239d06837">
+  <!ENTITY nautilus-cd-burner-size          "740 KB">
+  <!ENTITY nautilus-cd-burner-buildsize     "15 MB">
+  <!ENTITY nautilus-cd-burner-time          "0.3 SBU">
+]>
+
+<sect1 id="nautilus-cd-burner"
+xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
+  <?dbhtml filename="nautilus-cd-burner.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Nautilus CD Burner-&nautilus-cd-burner-version;</title>
+
+  <indexterm zone="nautilus-cd-burner">
+    <primary sortas="a-Nautilus-CD-Burner">Nautilus CD Burner</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Nautilus CD Burner</title>
+
+    <para>The <application>Nautilus CD Burner</application> package provides
+    an easy method to write files to a CD or DVD burner with
+    <application>GNOME</application>; by drag-and-dropping files using the
+    <application>GNOME</application> file manager,
+    <application>Nautilus</application>.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nautilus-cd-burner-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nautilus-cd-burner-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nautilus-cd-burner-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nautilus-cd-burner-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nautilus-cd-burner-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nautilus-cd-burner-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Nautilus CD Burner Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="nautilus"/>
+    and <xref linkend="hal"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gnome-mount"/> and
+    <xref linkend="intltool"/></para>
+
+    <para>Though <application>Nautilus CD Burner</application> happily passes
+    all the <command>configure</command> script checks and then builds
+    successfully without them, the <xref linkend="cdrtools"/> and
+    <xref linkend="dvd-rw-tools"/> packages are required to be installed or you
+    won't be able to create ISO filesystems or burn CDs and DVDs.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/NautilusCdBurner"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Nautilus CD Burner</title>
+
+    <para>Install <application>Nautilus CD Burner</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/nautilus-cd-burner &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"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <para><parameter>--libexecdir=`pkg-config --variable=prefix
+    ORBit-2.0`/lib/nautilus-cd-burner</parameter>: This parameter causes the
+    libexec files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/nautilus-cd-burner</filename>
+    instead of
+    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>nautilus-cd-burner</seg>
+        <seg>libnautilus-burn.so and gnome-vfs and nautilus modules</seg>
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
+        include/libnautilus-burn,
+        lib/nautilus-cd-burner and
+        share/nautilus-cd-burner</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="nautilus-cd-burner-prog">
+        <term><command>nautilus-cd-burner</command></term>
+        <listitem>
+          <para>is an extension to <application>Nautilus</application>
+          that lets you burn CDs easily.</para>
+          <indexterm zone="nautilus-cd-burner nautilus-cd-burner-prog">
+            <primary sortas="b-nautilus-cd-burner">nautilus-cd-burner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: introduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ introduction/important/locale-issues.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -144,15 +144,14 @@
     don't respect that environment variable are buggy.</para>
 
-    <para>The <xref linkend="zip"/>, <xref linkend="unzip"/>, and
-    <xref linkend="nautilus-cd-burner"/> have this problem because
-    they hard-code the expected filename encoding.
-    <application>UnZip</application> contains a hard-coded conversion
-    table between the CP850 (DOS) and ISO-8859-1 (UNIX) encodings and
-    uses this table when extracting archives created under DOS or
-    Microsoft Windows. However, this assumption only works for those
-    in the US and not for anyone using a UTF-8 locale. Non-ASCII
-    characters will be mangled in the extracted filenames.</para>
-
-    <para>On the other hand,
+    <para>The <xref linkend="zip"/> and <xref linkend="unzip"/> have this
+    problem because they hard-code the expected filename encoding.
+    <application>UnZip</application> contains a hard-coded conversion table
+    between the CP850 (DOS) and ISO-8859-1 (UNIX) encodings and uses this table
+    when extracting archives created under DOS or Microsoft Windows. However,
+    this assumption only works for those in the US and not for anyone using a
+    UTF-8 locale. Non-ASCII characters will be mangled in the extracted
+    filenames.</para>
+
+    <!--<para>On the other hand,
     <application>Nautilus CD Burner</application> checks names of
     files added to its window for UTF-8 validity. This is wrong for
@@ -161,5 +160,5 @@
     calls <command>mkisofs</command> with the
     <parameter>-input-charset UTF-8</parameter> parameter, which is
-    only correct in UTF-8 locales.</para>
+    only correct in UTF-8 locales.</para>-->
 
     <para>The general rule for avoiding this class of problems is to
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f9a051f9568e19f231236a7de8795567a57c1479)
+++ introduction/welcome/changelog.xml	(revision df8df0a56b22f5f577676fb2e9926471a828d701)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[wblaszcz] - Removed Nautilus CD Burner-2.18.2.</para>
+        </listitem>
+        <listitem>
           <para>[wblaszcz] - Removed unrecognized options: --enable-inotify from
           gnome-menus.</para>
