From f9928cb319c2879a56b7280f09723b26035982d0 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Wed, 17 Mar 2010 01:13:23 +0000
Subject: Set resource_select to activity by default since priority has always
 been a stupid default. More fixes coming up soon.

---
 doc/user-guide/commands.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/user-guide')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 931608ee..700df7bb 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -715,7 +715,7 @@
 	</bitlbee-setting>
 
 	<bitlbee-setting name="resource_select" type="string" scope="account">
-		<default>priority</default>
+		<default>activity</default>
 		<possible-values>priority, activity</possible-values>
 
 		<description>
-- 
cgit v1.2.3


From 0baed0da940c0d82280a5674d7fa8ad06d449384 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 19 Mar 2010 00:09:50 +0000
Subject: Allow changing the name of the control channel at run-time.

---
 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 700df7bb..f8ae4386 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -510,6 +510,16 @@
 
 	</bitlbee-setting>
 
+	<bitlbee-setting name="control_channel" type="string" scope="global">
+		<default>&amp;bitlbee</default>
+
+		<description>
+			<para>
+				Normally the control channel where you can see all your contacts is called "&amp;bitlbee". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
+			</para>
+		</description>
+	</bitlbee-setting>
+
 	<bitlbee-setting name="debug" type="boolean" scope="global">
 		<default>false</default>
 
-- 
cgit v1.2.3