From 45ccda9961ffc54a56cc43b0ddb4a11e3278f489 Mon Sep 17 00:00:00 2001
From: Badlop
Date: Sat, 21 Jun 2008 00:12:06 +0000
Subject: [PATCH] * doc/guide.tex: Explain that S2S outgoing first tries IPv4
and if that fails then tries IPv6 * doc/guide.html: Likewise
SVN Revision: 1372
---
ChangeLog | 6 ++++++
doc/guide.html | 5 ++++-
doc/guide.tex | 5 ++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d1ad5b80e..c2e4b8a95 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 7c5a89d14..1ba48ee2d 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 bf094b774..cb8e9dc6e 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\}}
--
2.50.1