Changeset 81ee561 for doc/user-guide/commands.xml

Timestamp:

2010-03-20T18:03:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head. Most changes are not so relevant because they're to IM
modules.

File:

• doc/user-guide/commands.xml (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -511 +511 @@
         </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>
@@ -716 +726 @@
 
         <bitlbee-setting name="resource_select" type="string" scope="account">
-                <default>priority</default>
+                <default>activity</default>
                 <possible-values>priority, activity</possible-values>