From a0f8a2c3a4f5d30a4a48adc18e252cfcc47d6ea0 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 17 Aug 2011 19:42:11 +0200
Subject: New option resource_conflict defines server action (thanks to Lee
 Boynton)(EJAB-650)

---
 doc/guide.tex | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'doc/guide.tex')

diff --git a/doc/guide.tex b/doc/guide.tex
index 49cfd5bf8..008363a28 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1215,6 +1215,16 @@ The following authentication methods are supported by \ejabberd{}:
 
 Account creation is only supported by internal, external and odbc methods.
 
+The option \option{resource\_conflict} defines the action when a client attempts to
+login to an account with a resource that is already connected.
+The option syntax is:
+\esyntax{\{resource\_conflict, setresource|closenew|closeold\}.}
+The possible values match exactly the three possibilities described in
+\footahref{http://tools.ietf.org/html/rfc6120\#section-7.7.2.2}{XMPP Core: section 7.7.2.2}.
+The default value is \term{closeold}.
+If the client uses old Jabber Non-SASL authentication (\xepref{0078}),
+then this option is not respected, and the action performed is \term{closeold}.
+
 \makesubsubsection{internalauth}{Internal}
 \ind{internal authentication}\ind{Mnesia}
 
-- 
cgit v1.2.3

