From: Badlop
Date: Sat, 21 Jun 2008 00:12:06 +0000 (+0000)
Subject: * doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if
X-Git-Tag: v2.1.0~18^2~680
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a3069b68de49a7e0e660eaa291b3cc4fe57e2ec;p=ejabberd
* doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if
that fails then tries IPv6
* doc/guide.html: Likewise
SVN Revision: 1372
---
diff --git a/ChangeLog b/ChangeLog
index e0bb52ad1..1ef86c354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21 Badlop
+
+ * 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
* 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.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
JWChat.
-
inet6 Set up the socket for IPv6.
+
inet6 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.
{ip, IPAddress} This option specifies which network
interface to listen for. For example {ip, {192, 168, 1, 1}}
.
{max_stanza_size, Size}
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\}}