From eca7588abfb22cf02bd1bc7b3437fbe8689ffb0b Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 25 Oct 2010 18:57:54 +0200 Subject: [PATCH] Recompile the guide.html --- doc/guide.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/guide.html b/doc/guide.html index d347087fa..6cf8f5ba8 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -822,9 +822,8 @@ Full path to the file containing the SSL certificate for a specific domain.
{outgoing_s2s_options, [Family, ...], Timeout}
Specify which address families to try, in what order, and connect timeout in milliseconds. By default it first tries connecting with IPv4, if that fails it tries using IPv6, -with a timeout of 10000 milliseconds: -
{outgoing_s2s_options, [ipv4, ipv6], 10000}.
-
{s2s_dns_options, [ {Property, Value}, ...]}
+with a timeout of 10000 milliseconds. +
{s2s_dns_options, [ {Property, Value}, ...]}
Define properties to use for DNS resolving. Allowed Properties are: timeout in seconds which default value is 10 and retries which default value is 2. @@ -906,6 +905,7 @@ section 4.3. The socket only listens connections to {s2s_use_starttls, true}. {s2s_certfile, "/etc/ejabberd/server.pem"}. {domain_certfile, "example.com", "/etc/ejabberd/example_com.pem"}. +{outgoing_s2s_options, [ipv4, ipv6], 10000}.

In this example, the following configuration defines that:

{captcha_protected, false|true}
+Protect registrations with CAPTCHA (see section 3.1.8). The default is false. +
{password_strength, Entropy}
+This option sets the minimum informational entropy for passwords. The value Entropy +is a number of bits of entropy. The recommended minimum is 32 bits. +The default is 0, i.e. no checks are performed.
{welcome_message, Message}
Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body.