--- a/man/ChangeLog	Mon Jul 27 01:18:47 2009 +0900
+++ b/man/ChangeLog	Mon Jul 27 01:29:49 2009 +0900
@@ -7,6 +7,15 @@
 	* internals/internals.texi: s/@urlref/@uref/g.
 	(Lstreams): Add urefs to David Beasley tutorials.
 
+2009-04-20  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q2.5.3): 
+	Add information about resolver configuration to Q2.5.3.
+	Thanks to Guillaume MULLER <gm.work.lists@gmail.com>.
+
+	* xemacs-faq.texi (Top): Update menu.
+	* xemacs-faq.texi (Installation): Update menu.
+
 2009-02-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* xemacs-faq.texi (Q3.0.12): New node for Meta key on Mac.

--- a/man/xemacs-faq.texi	Mon Jul 27 01:18:47 2009 +0900
+++ b/man/xemacs-faq.texi	Mon Jul 27 01:29:49 2009 +0900
@@ -322,7 +322,7 @@
 2.5: Startup-Related Problems
 * Q2.5.1::    XEmacs cannot connect to my X Terminal!
 * Q2.5.2::    Startup problems related to paths or package locations.
-* Q2.5.3::    XEmacs won't start without network.
+* Q2.5.3::    XEmacs won't start without network, or starts slowly.
 * Q2.5.4::    Startup warnings about deducing proper fonts?
 * Q2.5.5::    Warnings from incorrect key modifiers.
 * Q2.5.6::    XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
@@ -3124,7 +3124,7 @@
 2.5: Startup-Related Problems
 * Q2.5.1::    XEmacs cannot connect to my X Terminal!
 * Q2.5.2::    Startup problems related to paths or package locations.
-* Q2.5.3::    XEmacs won't start without network.
+* Q2.5.3::    XEmacs won't start without network, or starts slowly.
 * Q2.5.4::    Startup warnings about deducing proper fonts?
 * Q2.5.5::    Warnings from incorrect key modifiers.
 * Q2.5.6::    XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
@@ -4471,7 +4471,7 @@
 this means that no value was compiled into XEmacs using these parameters.
 
 @node Q2.5.3, Q2.5.4, Q2.5.2, Installation
-@unnumberedsubsec Q2.5.3: XEmacs won't start without network.
+@unnumberedsubsec Q2.5.3: XEmacs won't start without network, or starts slowly.
 
 If XEmacs starts when you're on the network, but fails when you're not
 on the network, you may be missing a "localhost" entry in your
@@ -4481,7 +4481,16 @@
 127.0.0.1        localhost
 @end example
 
-Add that line, and XEmacs will be happy.
+Add that line, and XEmacs will be happy.  If your network is unreliable,
+such as a Wifi network, you may experience delays but eventually XEmacs
+starts up.  This may be due to having the lookup order give precedence
+to DNS over the hosts file (often lookup order is defined in one of the
+files @file{/etc/host.conf}, @file{/etc/nsswitch.conf}, or
+@file{/etc/resolv.conf}, depending on OS).  See your system
+documentation for this configuration.  Note that changing the lookup
+order is a workaround; there are good reasons to have DNS come earlier
+by default.  Make sure those reasons are less important to you than a
+quick XEmacs startup.
 
 @node Q2.5.4, Q2.5.5, Q2.5.3, Installation
 @unnumberedsubsec Q2.5.4: Startup warnings about deducing proper fonts?