Index: en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
+++ en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -33,10 +33,9 @@
   <title>Using <literal>sgml-mode</literal> with
     <application>Emacs</application></title>
 
-  <para>Recent versions of <application>Emacs</application> or
-    <application>XEmacs</application> (available from the Ports
-    Collection) contain a very useful package called PSGML (can be
-    installed from <package>editors/psgml</package>).
+  <para>Recent versions of <application>Emacs</application> (available
+    from the Ports Collection) contain a very useful package called
+    PSGML (can be installed from <package>editors/psgml</package>).
     Automatically invoked when a file with the
     <filename>.xml</filename> extension is loaded, or by typing
     <command>M-x sgml-mode</command>, it is a major mode for dealing
Index: en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
+++ en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
@@ -123,10 +123,8 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term><application>Emacs</application> or
-	    <application>XEmacs</application>
-	    (<package>editors/emacs</package> or
-	    <package>editors/xemacs</package>)</term>
+	  <term><application>Emacs</application>
+	    (<package>editors/emacs</package>)</term>
 
 	  <listitem>
 	    <para>Both of these editors include a special mode for
Index: en_US.ISO8859-1/htdocs/applications.xml
===================================================================
--- en_US.ISO8859-1/htdocs/applications.xml
+++ en_US.ISO8859-1/htdocs/applications.xml
@@ -96,7 +96,7 @@
 	  languages like Icon work just fine, too.  And FreeBSD's shared
 	  libraries have always been easy to make and use.  You can also
 	  choose from a wide range of popular and powerful editors, such as
-	  XEmacs and Vim.</li>
+	  Emacs and Vim.</li>
 
 	<li><b>Net surfing.</b> A real UNIX workstation makes a great Internet
 	  surfboard. FreeBSD versions of <a