diff --git a/ChangeLog b/ChangeLog
index e0bb52ad1..1ef86c354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Explain that S2S outgoing first tries IPV4 and if
+	that fails then tries IPv6
+	* doc/guide.html: Likewise
+
 2008-06-18  Badlop  <badlop@process-one.net>
 
 	* src/ejabberd.app: The ejabberd version number is defined in the
diff --git a/doc/guide.html b/doc/guide.html
index b94c65959..aa0e1a9e1 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -623,7 +623,10 @@ do not allow outgoing sockets on port 5222.<P>If HTTP Polling is enabled, it wil
 is also needed in the Jabber client. Remark also that HTTP Polling can be
 interesting to host a web-based Jabber client such as
 <A HREF="http://jwchat.sourceforge.net/">JWChat</A>.
-</P></DD><DT CLASS="dt-description"><B><TT>inet6</TT></B></DT><DD CLASS="dd-description"> Set up the socket for IPv6.
+</P></DD><DT CLASS="dt-description"><B><TT>inet6</TT></B></DT><DD CLASS="dd-description"> Set up the socket for IPv6 instead of IPv4.
+Note: this option is not required for S2S outgoing connections,
+because when ejabberd attempts to establish a S2S outgoing connection 
+it first tries IPv4, and if that fails it attempts with IPv6.
 </DD><DT CLASS="dt-description"><B><TT>{ip, IPAddress}</TT></B></DT><DD CLASS="dd-description"> This option specifies which network
 interface to listen for. For example <CODE>{ip, {192, 168, 1, 1}}</CODE>.
 </DD><DT CLASS="dt-description"><B><TT>{max_stanza_size, Size}</TT></B></DT><DD CLASS="dd-description">
diff --git a/doc/guide.tex b/doc/guide.tex
index 73d889fc5..be40363b2 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -729,7 +729,10 @@ This is a detailed description of each option allowed by the listening modules:
     is also needed in the \Jabber{} client. Remark also that HTTP Polling can be
     interesting to host a web-based \Jabber{} client such as
     \footahref{http://jwchat.sourceforge.net/}{JWChat}.
-  \titem{inet6} \ind{options!inet6}\ind{IPv6}Set up the socket for IPv6.
+  \titem{inet6} \ind{options!inet6}\ind{IPv6}Set up the socket for IPv6 instead of IPv4.
+    Note: this option is not required for S2S outgoing connections,
+    because when ejabberd attempts to establish a S2S outgoing connection 
+    it first tries IPv4, and if that fails it attempts with IPv6.
   \titem{\{ip, IPAddress\}} \ind{options!ip}This option specifies which network
     interface to listen for. For example \verb|{ip, {192, 168, 1, 1}}|.
     \titem{\{max\_stanza\_size, Size\}}