diff --git a/en/gnome/docs/faq214.sgml b/en/gnome/docs/faq214.sgml
index ebc76d6c86..8528864cf6 100644
--- a/en/gnome/docs/faq214.sgml
+++ b/en/gnome/docs/faq214.sgml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../../">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/faq214.sgml,v 1.4 2006/05/01 02:41:00 marcus Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/faq214.sgml,v 1.5 2006/05/01 16:26:04 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME &gnomever; Upgrading FAQ">
 <!ENTITY % navincludes SYSTEM "../includes.navgnome.sgml"> %navincludes;
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
@@ -95,10 +95,9 @@
 
       <ul>
 	<li>GNOME &gnomever; and KDE 3.5 currently conflict with
-	  each other.  The two conflicts are between Avahi and
-	  mDNSResponder and between poppler and xpdf.  Solutions to
-	  these conflicts are being sought.  Hopefully, this will be
-	  resolved soon.</li>
+	  each other.  The conflict is between poppler and xpdf.
+	  A solutions to this conflict is being sought.  Hopefully,
+	  this will be resolved soon.</li>
       </ul>
       </li>
 
