aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CHANGES8
-rw-r--r--doc/user-guide/commands.xml12
2 files changed, 18 insertions, 2 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index a0e9b30b..1cac2dc7 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -9,7 +9,8 @@ Version 1.2.5:
- Avoid linking in a static version of libresolv now that glibc has all
relevant functions available in the dynamic version.
- Improved away state code and added the ability to set (non-away) status
- messages using "set status" (also possible per account).
+ messages using "set status" (also possible per account) and see them in
+ blist and /whois output.
- Added a post-1.2 equivalent of encode/decode to quickly encrypt/decrypt
passwords in a way that BitlBee can read them.
- Allow using the full name for generating nicknames, instead of just the
@@ -17,6 +18,11 @@ Version 1.2.5:
- Auto reconnect is now enabled by default since all protocols can properly
detect cases where auto reconnect should be avoided (i.e. concurrent
logins).
+- Changed the default resource_select setting which should reduce message
+ routing issues on Jabber (i.e. messages going someone's phone instead of
+ the main client).
+
+Fixed 17 Mar 2010
Version 1.2.4:
- Most important change (and main reason for releasing now): Upgraded Yahoo!
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 931608ee..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>
@@ -715,7 +725,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>