From af9f2ca883354a47635d130ff5e7bd693a200a29 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 11 Jul 2010 11:59:56 +0100
Subject: Added allow_takeover setting for people who don't like this new
 functionality.

---
 doc/user-guide/commands.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'doc/user-guide')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 4154fb27..be61e4db 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -420,6 +420,16 @@
 		</description>
 	</bitlbee-setting>
 
+	<bitlbee-setting name="allow_takeover" type="boolean" scope="global">
+		<default>true</default>
+
+		<description>
+			<para>
+				When you're already connected to a BitlBee server and you connect (and identify) again, BitlBee will offer to migrate your existing session to the new connection. If for whatever reason you don't want this, you can disable this setting.
+			</para>
+		</description>
+	</bitlbee-setting>
+
 	<bitlbee-setting name="auto_connect" type="boolean" scope="both">
 		<default>true</default>
 
-- 
cgit v1.2.3